From: guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Mon, 20 Dec 2010 05:35:29 +0000 (+0000)
Subject: Rename the routines that handle dissector tables with unsigned integer
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=c5e22ceda7475551ce36e74cebca688ef0472ee8

Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35224 f5534014-38df-0310-8fa8-9805f1628bb7
---

diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf
index b7fc70d9e8..aa1a2975d9 100644
--- a/asn1/ansi_map/ansi_map.cnf
+++ b/asn1/ansi_map/ansi_map.cnf
@@ -287,17 +287,17 @@ TerminalType
 		}
 		if (ansi_map_sms_tele_id != -1)
 		{
-			dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+			dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
 		}
 		else
 		{
 			switch(ServiceIndicator){
 				case 1: /* CDMA OTASP Service */
 				case 3: /* CDMA OTAPA Service */
-					dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				case 4: /* CDMA Position Determination Service */
-					dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				default:
 					break;
@@ -334,7 +334,7 @@ TerminalType
 		ansi_map_sms_tele_id = tvb_get_ntohs(tvb,0);
 		if ((ansi_map_sms_tele_id != -1)&&(SMS_BearerData_tvb !=NULL))
 		{
-		    dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+		    dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
 		}
 	}
 
@@ -447,10 +447,10 @@ TerminalType
 			switch(ServiceIndicator){
 				case 1: /* CDMA OTASP Service */
 				case 3: /* CDMA OTAPA Service */
-					dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				case 4: /* CDMA Position Determination Service */
-					dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				default:
 					break;
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index 8ff2eaf01f..d53a0c21a6 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -107,12 +107,12 @@ static GHashTable* itu_sub_dissectors = NULL;
 
   extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
-    dissector_delete("sccp.ssn",ssn,tcap_handle);
+    dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 70d439473a..e7f3c75894 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -400,7 +400,7 @@ void proto_reg_handoff_cmp(void) {
 		dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
 
 		cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
-		dissector_add("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
+		dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
 
 		oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
 		oid_add_from_string("Cryptlib-PKIBoot","1.3.6.1.4.1.3029.3.1.2");
@@ -419,17 +419,17 @@ void proto_reg_handoff_cmp(void) {
 	/* change alternate TCP port if changed in the preferences */
 	if (cmp_alternate_tcp_port != cmp_alternate_tcp_port_prev) {
 		if (cmp_alternate_tcp_port_prev != 0)
-			dissector_delete("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
+			dissector_delete_uint("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
 		if (cmp_alternate_tcp_port != 0)
-			dissector_add("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
+			dissector_add_uint("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
 		cmp_alternate_tcp_port_prev = cmp_alternate_tcp_port;
 	}
 
 	/* change alternate HTTP port if changed in the preferences */
 	if (cmp_alternate_http_port != cmp_alternate_http_port_prev) {
 		if (cmp_alternate_http_port_prev != 0) {
-			dissector_delete("tcp.port", cmp_alternate_http_port_prev, NULL);
-			dissector_delete("http.port", cmp_alternate_http_port_prev, NULL);
+			dissector_delete_uint("tcp.port", cmp_alternate_http_port_prev, NULL);
+			dissector_delete_uint("http.port", cmp_alternate_http_port_prev, NULL);
 		}
 		if (cmp_alternate_http_port != 0)
 			http_dissector_add( cmp_alternate_http_port, cmp_http_handle);
@@ -439,8 +439,8 @@ void proto_reg_handoff_cmp(void) {
 	/* change alternate TCP-style-HTTP port if changed in the preferences */
 	if (cmp_alternate_tcp_style_http_port != cmp_alternate_tcp_style_http_port_prev) {
 		if (cmp_alternate_tcp_style_http_port_prev != 0) {
-			dissector_delete("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
-			dissector_delete("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+			dissector_delete_uint("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+			dissector_delete_uint("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
 		}
 		if (cmp_alternate_tcp_style_http_port != 0)
 			http_dissector_add( cmp_alternate_tcp_style_http_port, cmp_tcp_style_http_handle);
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index 7ae880a79f..05e403af77 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -162,12 +162,12 @@ prefs_register_dap(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dap_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dap_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dap_tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 5fa4574933..9d29e2d6d5 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -269,12 +269,12 @@ prefs_register_disp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_disp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_disp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_disp_tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index 5ccc260bcc..7ade3638bc 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -324,12 +324,12 @@ prefs_register_dop(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dop_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index ead5645948..91333d572a 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -331,12 +331,12 @@ prefs_register_dsp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dsp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dsp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dsp_tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c
index bbce687b39..1d218e3e75 100644
--- a/asn1/goose/packet-goose-template.c
+++ b/asn1/goose/packet-goose-template.c
@@ -154,5 +154,5 @@ void proto_reg_handoff_goose(void) {
 	dissector_handle_t goose_handle;
 	goose_handle = find_dissector("goose");
 	
-	dissector_add("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
 }
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf
index 7b9ac29f38..345d6b9d78 100644
--- a/asn1/gsm_map/gsm_map.cnf
+++ b/asn1/gsm_map/gsm_map.cnf
@@ -287,7 +287,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY ForwardSM-Arg
 
@@ -296,7 +296,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MO-ForwardSM-Arg
 
@@ -305,7 +305,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MO-ForwardSM-Res
 
@@ -314,7 +314,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-Arg
 
@@ -323,7 +323,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-Res
 
@@ -332,7 +332,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-VGCS-Arg
 
@@ -341,7 +341,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-VGCS-Res
 
@@ -350,7 +350,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY SS-Status VAL_PTR = &parameter_tvb
 
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 23ea813fd7..e2b7cc0f65 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -597,7 +597,7 @@ NonStandardIdentifier/object  FN_VARIANT = _str  VAL_PTR = &nsiOID
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
 			break;
 		case 1 :  /* h221NonStandard */
-			nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+			nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
 			break;
 		default :
 			nsp_handle = NULL;
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 50ffa089e8..48c8c48f63 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -298,8 +298,8 @@ proto_reg_handoff_h225(void)
 
 	if (!h225_prefs_initialized) {
 		h225ras_handle=find_dissector("h225.ras");
-		dissector_add("udp.port", UDP_PORT_RAS1, h225ras_handle);
-		dissector_add("udp.port", UDP_PORT_RAS2, h225ras_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RAS1, h225ras_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RAS2, h225ras_handle);
 
 		h245_handle = find_dissector("h245");
 		h245dg_handle = find_dissector("h245dg");
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf
index c103e0b320..11c9f54f7f 100644
--- a/asn1/h245/h245.cnf
+++ b/asn1/h245/h245.cnf
@@ -940,7 +940,7 @@ NonStandardIdentifier/object  FN_VARIANT = _str  VAL_PTR = &nsiOID
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
 			break;
 		case 1 :  /* h221NonStandard */
-			nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+			nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
 			break;
 		default :
 			nsp_handle = NULL;
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index b41f8ad2ec..14588f3618 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1548,26 +1548,26 @@ void proto_reg_handoff_h248(void) {
     if (!initialized) {
         h248_handle = find_dissector("h248");
         h248_tpkt_handle = find_dissector("h248.tpkt");
-        dissector_add("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
+        dissector_add_uint("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
         h248_term_handle = find_dissector("h248term");
         initialized = TRUE;
     } else {
         if (udp_port != 0)
-            dissector_delete("udp.port", udp_port, h248_handle);
+            dissector_delete_uint("udp.port", udp_port, h248_handle);
 
         if (tcp_port != 0)
-            dissector_delete("tcp.port", tcp_port, h248_tpkt_handle);
+            dissector_delete_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 
     udp_port = global_udp_port;
     tcp_port = global_tcp_port;
 
     if (udp_port != 0) {
-        dissector_add("udp.port", udp_port, h248_handle);
+        dissector_add_uint("udp.port", udp_port, h248_handle);
     }
 
     if (tcp_port != 0) {
-        dissector_add("tcp.port", tcp_port, h248_tpkt_handle);
+        dissector_add_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 }
 
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 241e7c8fb5..ded2415430 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -289,12 +289,12 @@ proto_reg_handoff_h450(void)
   h450_arg_handle = new_create_dissector_handle(dissect_h450_arg, proto_h450);
   h450_res_handle = new_create_dissector_handle(dissect_h450_res, proto_h450);
   for (i=0; i<(int)array_length(h450_op_tab); i++) {
-    dissector_add("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
-    dissector_add("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
+    dissector_add_uint("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
+    dissector_add_uint("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
   }
   h450_err_handle = new_create_dissector_handle(dissect_h450_err, proto_h450);
   for (i=0; i<(int)array_length(h450_err_tab); i++) {
-    dissector_add("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
+    dissector_add_uint("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
   }
 
 }
diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index 39ca317a57..55e337ae2a 100644
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -145,15 +145,15 @@ void proto_reg_handoff_h501(void)
     h501_tcp_handle = new_create_dissector_handle(dissect_h501_tcp, proto_h501);
     h501_prefs_initialized = TRUE;
   } else {
-    dissector_delete("udp.port", saved_h501_udp_port, h501_udp_handle);
-    dissector_delete("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+    dissector_delete_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
+    dissector_delete_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
   }
 
   /* Set our port number for future use */
   saved_h501_udp_port = h501_udp_port;
-  dissector_add("udp.port", saved_h501_udp_port, h501_udp_handle);
+  dissector_add_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
   saved_h501_tcp_port = h501_tcp_port;
-  dissector_add("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+  dissector_add_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
 
 }
 
diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c
index a8662e6a05..18639af3c5 100644
--- a/asn1/hnbap/packet-hnbap-template.c
+++ b/asn1/hnbap/packet-hnbap-template.c
@@ -85,12 +85,12 @@ void proto_reg_handoff_hnbap(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 #if 0
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -114,17 +114,17 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -192,14 +192,14 @@ proto_reg_handoff_hnbap(void)
 
         if (!initialized) {
                 hnbap_handle = find_dissector("hnbap");
-                dissector_add("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
+                dissector_add_uint("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
                 initialized = TRUE;
 #include "packet-hnbap-dis-tab.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, hnbap_handle);
+                dissector_delete_uint("sctp.port", sctp_port, hnbap_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, hnbap_handle);
+        dissector_add_uint("sctp.port", sctp_port, hnbap_handle);
 }
diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c
index 5ca8a8bdde..877c1559b5 100644
--- a/asn1/idmp/packet-idmp-template.c
+++ b/asn1/idmp/packet-idmp-template.c
@@ -378,12 +378,12 @@ prefs_register_idmp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if(idmp_handle)
-    dissector_delete("tcp.port", tcp_port, idmp_handle);
+    dissector_delete_uint("tcp.port", tcp_port, idmp_handle);
 
   /* Set our port number for future use */
   tcp_port = global_idmp_tcp_port;
 
   if((tcp_port > 0) && idmp_handle)
-    dissector_add("tcp.port", global_idmp_tcp_port, idmp_handle);
+    dissector_add_uint("tcp.port", global_idmp_tcp_port, idmp_handle);
 
 }
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index d2781df976..b82ce9230a 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -1639,9 +1639,9 @@ proto_reg_handoff_kerberos(void)
     kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
 	proto_kerberos);
 	*/
-    dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
+    dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
 	/*
-    dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
+    dissector_add_uint("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
 	*/
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
 				      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index a55186f42e..b4fec9b113 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1745,7 +1745,7 @@ this_was_not_normal_ldap:
 	  guint32 old_start_tls_frame;
 
 	  /* temporarily dissect this port as SSL */
-	  dissector_delete("tcp.port", tcp_port, ldap_handle);
+	  dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
 	  ssl_dissector_add(tcp_port, "ldap", TRUE);
 
 	  old_start_tls_frame = ldap_info->start_tls_frame;
@@ -1758,7 +1758,7 @@ this_was_not_normal_ldap:
 	  ssl_dissector_delete(tcp_port, "ldap", TRUE);
 
 	  /* restore ldap as the dissector for this port */
-	  dissector_add("tcp.port", tcp_port, ldap_handle);
+	  dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
 	  /* we are done */
 	  return;
@@ -2130,10 +2130,10 @@ proto_reg_handoff_ldap(void)
 	dissector_handle_t cldap_handle;
 	ldap_handle = find_dissector("ldap");
 
-	dissector_add("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
 
 	cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
-	dissector_add("udp.port", UDP_PORT_CLDAP, cldap_handle);
+	dissector_add_uint("udp.port", UDP_PORT_CLDAP, cldap_handle);
 
 	gssapi_handle = find_dissector("gssapi");
 	gssapi_wrap_handle = find_dissector("gssapi_verf");
@@ -2205,13 +2205,13 @@ prefs_register_ldap(void)
 
   if(tcp_port != global_ldap_tcp_port) {
     if(tcp_port)
-      dissector_delete("tcp.port", tcp_port, ldap_handle);
+      dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
 
     /* Set our port number for future use */
     tcp_port = global_ldap_tcp_port;
 
     if(tcp_port)
-      dissector_add("tcp.port", tcp_port, ldap_handle);
+      dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
   }
 
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index c83c5678be..0f7b93795f 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -708,6 +708,6 @@ proto_reg_handoff_mpeg_pes(void)
 {
 	dissector_handle_t mpeg_handle = find_dissector("mpeg");
 
-	dissector_add("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
 	heur_dissector_add("mpeg", dissect_mpeg_pes, proto_mpeg_pes);
 }
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index 1bd8f57060..f8f761b794 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -84,12 +84,12 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -178,7 +178,7 @@ proto_reg_handoff_nbap(void)
 	dissector_handle_t nbap_handle;
 
 	nbap_handle = find_dissector("nbap");
-	dissector_add("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
+	dissector_add_uint("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
 	dissector_add_handle("sctp.port", nbap_handle);  /* for "decode-as" */
 
 #include "packet-nbap-dis-tab.c"
diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c
index 8f712769b7..2266337d70 100644
--- a/asn1/p7/packet-p7-template.c
+++ b/asn1/p7/packet-p7-template.c
@@ -147,12 +147,12 @@ prefs_register_p7(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_p7_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_p7_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_p7_tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c
index 91252424d9..791558c49c 100644
--- a/asn1/pcap/packet-pcap-template.c
+++ b/asn1/pcap/packet-pcap-template.c
@@ -97,32 +97,32 @@ static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -145,14 +145,14 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn ) {
-        dissector_delete("sccp.ssn", ssn, pcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn) {
-        dissector_add("sccp.ssn", ssn, pcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 66e8d84ca0..67340a0e4e 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -324,9 +324,9 @@ void proto_reg_handoff_q932(void) {
 
   q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
   /* Facility */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
   /* Notification indicator */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
 
   q932_ros_handle = find_dissector("q932.ros");
 }
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 580eb6a8e7..26be9e4182 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -685,8 +685,8 @@ void proto_reg_handoff_qsig(void) {
   qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
   qsig_res_handle = new_create_dissector_handle(dissect_qsig_res, proto_qsig);
   for (i=0; i<(int)array_length(qsig_op_tab); i++) {
-    dissector_add("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
-    dissector_add("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
+    dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
+    dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
     key = qsig_op_tab[i].opcode;
     oid = g_hash_table_lookup(qsig_opcode2oid_hashtable, &key);
     if (oid) {
@@ -696,16 +696,16 @@ void proto_reg_handoff_qsig(void) {
   }
   qsig_err_handle = new_create_dissector_handle(dissect_qsig_err, proto_qsig);
   for (i=0; i<(int)array_length(qsig_err_tab); i++) {
-    dissector_add("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
+    dissector_add_uint("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
   }
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
   /* QSIG-TC - Transit counter */
-  dissector_add("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
   /* SSIG-BC - Party category */
-  dissector_add("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
   /* RFC 3204, 3.2 QSIG Media Type */
   dissector_add_string("media_type", "application/qsig", q931_handle);
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index b1302e553d..1053cae3a5 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -151,16 +151,16 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 	  case id_RelocationPreparation:
 		  if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){
 			  key = SPECIAL | ProtocolIE_ID;
-			  ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+			  ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 			  break;
 		  }
 		  /* Fall trough */
 	  default:
 		  /* no special handling */
-		  ret = (dissector_try_port_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+		  ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 		  if (ret == 0) {
 			  key = pdu_type | ProtocolIE_ID;
-			  ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+			  ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 		  }
 		  break;
   }
@@ -169,41 +169,41 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = IMSG;
-  return (dissector_try_port_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = SOUT;
-  return (dissector_try_port_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -349,10 +349,10 @@ proto_reg_handoff_ranap(void)
 		initialized = TRUE;
 #include "packet-ranap-dis-tab.c"
 	} else {
-		dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
+		dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
 	}
 
-	dissector_add("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
+	dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
 	local_ranap_sccp_ssn = global_ranap_sccp_ssn;
 	/* Add heuristic dissector
 	* Perhaps we want a preference whether the heuristic dissector
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index ff9d5b698d..d7b24d4ea8 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -211,7 +211,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 %(DEFAULT_BODY)s
 
 	if (nas_pdu_tvb)
-		dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
+		dissector_try_uint(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
 #.END
 
 #.FN_BODY RRC-Container VAL_PTR = &rrc_message_tvb
@@ -258,7 +258,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 %(DEFAULT_BODY)s
 	if (l3_info_tvb)
-		dissector_try_port(nas_pdu_dissector_table, 0x1, l3_info_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
+		dissector_try_uint(nas_pdu_dissector_table, 0x1, l3_info_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
 #.END
 
 # following construction is not supported by asn2wrs
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 43507f36d6..ee34f4f5e6 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -87,12 +87,12 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -173,7 +173,7 @@ proto_reg_handoff_rnsap(void)
 	rnsap_handle = find_dissector("rnsap");
 	rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch");
 
-	dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
+	dissector_add_uint("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
 	/* Add heuristic dissector
 	 * Perhaps we want a preference whether the heuristic dissector
 	 * is or isn't enabled
diff --git a/asn1/ros/ros-err.cnf b/asn1/ros/ros-err.cnf
index caa7729cfb..9ec5a788cd 100644
--- a/asn1/ros/ros-err.cnf
+++ b/asn1/ros/ros-err.cnf
@@ -12,7 +12,7 @@
   actx->rose_ctx->d.pdu = 3;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) {
-    err_handle = dissector_get_port_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
+    err_handle = dissector_get_uint_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->err_global_dissector_table) {
     err_handle = dissector_get_string_handle(actx->rose_ctx->err_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
diff --git a/asn1/ros/ros-inv.cnf b/asn1/ros/ros-inv.cnf
index aa24364585..8c663d9b7b 100644
--- a/asn1/ros/ros-inv.cnf
+++ b/asn1/ros/ros-inv.cnf
@@ -13,7 +13,7 @@
   actx->rose_ctx->d.pdu = 1;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) {
-    arg_handle = dissector_get_port_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
+    arg_handle = dissector_get_uint_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->arg_global_dissector_table) {
     arg_handle = dissector_get_string_handle(actx->rose_ctx->arg_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
diff --git a/asn1/ros/ros-res.cnf b/asn1/ros/ros-res.cnf
index 4f85d0c419..5b0a4cc8f9 100644
--- a/asn1/ros/ros-res.cnf
+++ b/asn1/ros/ros-res.cnf
@@ -13,7 +13,7 @@
   actx->rose_ctx->d.pdu = 2;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) {
-    res_handle = dissector_get_port_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
+    res_handle = dissector_get_uint_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->res_global_dissector_table) {
     res_handle = dissector_get_string_handle(actx->rose_ctx->res_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c
index 2826438241..bda78611a6 100644
--- a/asn1/rua/packet-rua-template.c
+++ b/asn1/rua/packet-rua-template.c
@@ -89,27 +89,27 @@ void proto_reg_handoff_rua(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -179,14 +179,14 @@ proto_reg_handoff_rua(void)
         if (!initialized) {
                 rua_handle = find_dissector("rua");
                 ranap_handle = find_dissector("ranap");
-                dissector_add("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
+                dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
                 initialized = TRUE;
 #include "packet-rua-dis-tab.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, rua_handle);
+                dissector_delete_uint("sctp.port", sctp_port, rua_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, rua_handle);
+        dissector_add_uint("sctp.port", sctp_port, rua_handle);
 }
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index f6ce7e21bb..cff5f3fa76 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -123,38 +123,38 @@ static int dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(tvbuff_t *tvb,
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 /* Currently not used
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 */
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 
@@ -187,18 +187,18 @@ proto_reg_handoff_s1ap(void)
 	if (!Initialized) {
 		nas_eps_handle = find_dissector("nas-eps");
 		dissector_add_handle("sctp.port", s1ap_handle);   /* for "decode-as"  */
-		dissector_add("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
+		dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
 		Initialized=TRUE;
 #include "packet-s1ap-dis-tab.c"
 	} else {
 		if (SctpPort != 0) {
-			dissector_delete("sctp.port", SctpPort, s1ap_handle);
+			dissector_delete_uint("sctp.port", SctpPort, s1ap_handle);
 		}
 	}
 
 	SctpPort=gbl_s1apSctpPort;
 	if (SctpPort != 0) {
-		dissector_add("sctp.port", SctpPort, s1ap_handle);
+		dissector_add_uint("sctp.port", SctpPort, s1ap_handle);
 	}
 }
 
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index b5ff7f74ce..457cd9f552 100644
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -87,27 +87,27 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static guint
@@ -215,9 +215,9 @@ proto_reg_handoff_sabp(void)
 
   sabp_handle = find_dissector("sabp");
   sabp_tcp_handle = find_dissector("sabp.tcp");
-  dissector_add("udp.port", 3452, sabp_handle);
-  dissector_add("tcp.port", 3452, sabp_tcp_handle);
-  dissector_add("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
+  dissector_add_uint("udp.port", 3452, sabp_handle);
+  dissector_add_uint("tcp.port", 3452, sabp_tcp_handle);
+  dissector_add_uint("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
 
 #include "packet-sabp-dis-tab.c"
 
diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index 9f507961fa..f1cb536f95 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -183,6 +183,6 @@ void proto_reg_handoff_smrse(void) {
   dissector_handle_t smrse_handle;
 
   smrse_handle = new_create_dissector_handle(dissect_smrse, proto_smrse);
-  dissector_add("tcp.port",TCP_PORT_SMRSE, smrse_handle);
+  dissector_add_uint("tcp.port",TCP_PORT_SMRSE, smrse_handle);
 }
 
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 063aad6038..0a5971c983 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -2254,17 +2254,17 @@ void proto_reg_handoff_snmp(void) {
 
 	snmp_handle = find_dissector("snmp");
 
-	dissector_add("udp.port", UDP_PORT_SNMP, snmp_handle);
-	dissector_add("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
-	dissector_add("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
-	dissector_add("ethertype", ETHERTYPE_SNMP, snmp_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
-	dissector_add("hpext.dxsap", HPEXT_SNMP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_SNMP, snmp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
+	dissector_add_uint("hpext.dxsap", HPEXT_SNMP, snmp_handle);
 
 	snmp_tcp_handle = create_dissector_handle(dissect_snmp_tcp, proto_snmp);
-	dissector_add("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
 
 	data_handle = find_dissector("data");
 
@@ -2307,5 +2307,5 @@ proto_reg_handoff_smux(void)
 	dissector_handle_t smux_handle;
 
 	smux_handle = create_dissector_handle(dissect_smux, proto_smux);
-	dissector_add("tcp.port", TCP_PORT_SMUX, smux_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
 }
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index 9ab6f16f00..e667f6dfcc 100644
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -331,5 +331,5 @@ void proto_reg_handoff_sv(void) {
 	dissector_handle_t sv_handle;
 	sv_handle = find_dissector("sv");
 
-	dissector_add("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
 }
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 5ed1b73282..a08cffb4df 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -786,14 +786,14 @@ proto_reg_handoff_t38(void)
 		t38_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", tcp_port, t38_tcp_handle);
-		dissector_delete("udp.port", udp_port, t38_udp_handle);
+		dissector_delete_uint("tcp.port", tcp_port, t38_tcp_handle);
+		dissector_delete_uint("udp.port", udp_port, t38_udp_handle);
 	}
 	tcp_port = global_t38_tcp_port;
 	udp_port = global_t38_udp_port;
 
-	dissector_add("tcp.port", tcp_port, t38_tcp_handle);
-	dissector_add("udp.port", udp_port, t38_udp_handle);
+	dissector_add_uint("tcp.port", tcp_port, t38_tcp_handle);
+	dissector_add_uint("udp.port", udp_port, t38_udp_handle);
 
 }
 
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index aa2b2dfc8a..673cf092f5 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -108,23 +108,23 @@ static void dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
 
 extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(itu_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_itu_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn",ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 extern void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(itu_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_ansi_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn", ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn", ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
@@ -400,14 +400,14 @@ proto_register_tcap(void)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_delete("sccp.ssn", ssn, tcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_add("sccp.ssn", ssn, tcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
@@ -564,7 +564,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 				  p_tcap_context->subdissector_present=TRUE;
 			  } else {
 			    /* Not found, so try to find a subdissector according to SSN */
-			    if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+			    if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			      /* Found according to SSN */
 			      p_tcap_context->subdissector_handle=subdissector_handle;
 			      p_tcap_context->subdissector_present=TRUE;
@@ -610,7 +610,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
       } else {
 		  /* Search if we can found the sub protocol according to the SSN table */
 		  if ( (subdissector_handle
-			  = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+			  = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			  /* Found according to SSN */
 			  is_subdissector=TRUE;
 		  } else {
@@ -621,7 +621,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 	  } /* ACN */
 	} else {
 		/* There is no A.C.N for this transaction, so search in the SSN table */
-		if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+		if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			/* Found according to SSN */
 			is_subdissector=TRUE;
 		} else {
diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c
index a7988bb160..cb3558f39f 100644
--- a/asn1/ulp/packet-ulp-template.c
+++ b/asn1/ulp/packet-ulp-template.c
@@ -146,11 +146,11 @@ proto_reg_handoff_ulp(void)
 		rrlp_handle = find_dissector("rrlp");
 		initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", local_ulp_port, ulp_handle);
+		dissector_delete_uint("tcp.port", local_ulp_port, ulp_handle);
 	}
 
 	local_ulp_port = gbl_ulp_port;
-	dissector_add("tcp.port", gbl_ulp_port, ulp_handle);
+	dissector_add_uint("tcp.port", gbl_ulp_port, ulp_handle);
 
 	/* application/oma-supl-ulp */
 
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index 7fc87483df..730555f72e 100644
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -92,27 +92,27 @@ void proto_reg_handoff_x2ap(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -197,18 +197,18 @@ proto_reg_handoff_x2ap(void)
 	x2ap_handle = find_dissector("x2ap");
 	if (!Initialized) {
 		dissector_add_handle("sctp.port", x2ap_handle);  /* for "decode-as" */
-		dissector_add("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
+		dissector_add_uint("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
 		Initialized=TRUE;
 #include "packet-x2ap-dis-tab.c"
 	} else {
 		if (SctpPort != 0) {
-			dissector_delete("sctp.port", SctpPort, x2ap_handle);
+			dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);
 		}
 	}
 
 	SctpPort=gbl_x2apSctpPort;
 	if (SctpPort != 0) {
-		dissector_add("sctp.port", SctpPort, x2ap_handle);
+		dissector_add_uint("sctp.port", SctpPort, x2ap_handle);
 	}
 
 }
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index 55a9d2421b..e3739c0798 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -339,12 +339,12 @@ prefs_register_x411(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_x411_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index 7382b40145..5e447acbfd 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -535,7 +535,7 @@ MessageToken						B	"2.6.1.7.36"	"id-hat-forwarded-token"
 
 	if(extension_id != -1) {
 		proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_StandardExtension_vals, "standard-extension %%d")); 
-  		if (dissector_try_port(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+  		if (dissector_try_uint(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 			offset = tvb_length(tvb);
 		} else {
 			proto_item *item = NULL;
@@ -574,7 +574,7 @@ MessageToken						B	"2.6.1.7.36"	"id-hat-forwarded-token"
 #.FN_BODY ExtensionAttribute/extension-attribute-value
 
 	proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_ExtensionAttributeType_vals, "extension-attribute-type %%d")); 
-	if (dissector_try_port(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+	if (dissector_try_uint(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 		offset =tvb_length(tvb);
 	} else {
 		proto_item *item = NULL;
@@ -1234,7 +1234,7 @@ MessageToken						B	"2.6.1.7.36"	"id-hat-forwarded-token"
 #.FN_BODY TokenData/value
 
 	proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_TokenDataType_vals, "tokendata-type %%d")); 
-	if (dissector_try_port(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+	if (dissector_try_uint(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 		offset = tvb_length(tvb);
 	} else {
 		proto_item *item = NULL;
diff --git a/doc/README.developer b/doc/README.developer
index 1d944177c2..49392c98c6 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -1063,12 +1063,12 @@ proto_reg_handoff_PROTOABBREV(void)
 		  function (proto_reg_handoff).
 		*/
 
-		dissector_delete("tcp.port", currentPort, PROTOABBREV_handle);
+		dissector_delete_uint("tcp.port", currentPort, PROTOABBREV_handle);
 	}
 
 	currentPort = gPORT_PREF;
 
-	dissector_add("tcp.port", currentPort, PROTOABBREV_handle);
+	dissector_add_uint("tcp.port", currentPort, PROTOABBREV_handle);
 
 }
 
@@ -1088,7 +1088,7 @@ proto_reg_handoff_PROTOABBREV(void)
  */
 	PROTOABBREV_handle = new_create_dissector_handle(dissect_PROTOABBREV,
 							 proto_PROTOABBREV);
-	dissector_add("PARENT_SUBFIELD", ID_VALUE, PROTOABBREV_handle);
+	dissector_add_uint("PARENT_SUBFIELD", ID_VALUE, PROTOABBREV_handle);
 }
 #endif
 
@@ -3661,10 +3661,10 @@ example, stolen from packet-dns.c:
 	mdns_udp_handle = create_dissector_handle(dissect_mdns_udp,
 	    proto_dns);
 
-	dissector_add("udp.port", UDP_PORT_DNS, dns_udp_handle);
-	dissector_add("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
-	dissector_add("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
-	dissector_add("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_DNS, dns_udp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
 
 The dissect_dns_udp function does very little work and calls
 dissect_dns_common, while dissect_dns_tcp calls tcp_dissect_pdus with a
diff --git a/doc/README.heuristic b/doc/README.heuristic
index 8158135cf2..4945f6210c 100644
--- a/doc/README.heuristic
+++ b/doc/README.heuristic
@@ -205,7 +205,7 @@ proto_reg_handoff_PROTOABBREV(void)
         /* register as normal dissector for IP as well */
         PROTOABBREV_handle = new_create_dissector_handle(dissect_PROTOABBREV,
             proto_PROTOABBREV);
-        dissector_add("ip.proto", IP_PROTO_PROTOABBREV, PROTOABBREV_handle);
+        dissector_add_uint("ip.proto", IP_PROTO_PROTOABBREV, PROTOABBREV_handle);
         PROTOABBREV_inited = TRUE;
     }
 }
diff --git a/doc/README.python b/doc/README.python
index 0d6cb8a901..cfcf4b41eb 100644
--- a/doc/README.python
+++ b/doc/README.python
@@ -76,7 +76,7 @@ CLASSES
      |  
      |  protocol_ids(self)
      |      defined a list of tuples containing three values. Each tuple is defining
-     |      the parameters of dissector_add(). This function MUST be defined when
+     |      the parameters of dissector_add_uint(). This function MUST be defined when
      |      implementing the dissector of a specific protocol.
      |  
      |  register_handoff(self)
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.xml b/docbook/wsdg_src/WSDG_chapter_dissection.xml
index 90b969519c..14172651ca 100644
--- a/docbook/wsdg_src/WSDG_chapter_dissection.xml
+++ b/docbook/wsdg_src/WSDG_chapter_dissection.xml
@@ -133,7 +133,7 @@ proto_reg_handoff_foo(void)
     static dissector_handle_t foo_handle;
 
     foo_handle = create_dissector_handle(dissect_foo, proto_foo);
-    dissector_add("udp.port", FOO_PORT, foo_handle);
+    dissector_add_uint("udp.port", FOO_PORT, foo_handle);
 }]]>
    </programlisting></example>
 	<para>
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index c315ffb982..b347dab4f9 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -342,9 +342,9 @@ void proto_reg_handoff_2dparityfec(void)
    }
 
    if (dissect_fec) {
-      dissector_add("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
+      dissector_add_uint("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
    } else {
-      dissector_delete("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
+      dissector_delete_uint("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
    }
 }
 
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 22778ba536..2ff40f01ab 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -791,10 +791,10 @@ proto_reg_handoff_njack(void)
 	dissector_handle_t njack_handle;
 
 	njack_handle = new_create_dissector_handle(dissect_njack_static, proto_njack);
-	dissector_add("udp.port", PORT_NJACK_PC, njack_handle);
-	/* dissector_add("tcp.port", PORT_NJACK_PC, njack_handle); */
-	dissector_add("udp.port", PORT_NJACK_SWITCH, njack_handle);
-	/* dissector_add("tcp.port", PORT_NJACK_SWITCH, njack_handle); */
+	dissector_add_uint("udp.port", PORT_NJACK_PC, njack_handle);
+	/* dissector_add_uint("tcp.port", PORT_NJACK_PC, njack_handle); */
+	dissector_add_uint("udp.port", PORT_NJACK_SWITCH, njack_handle);
+	/* dissector_add_uint("tcp.port", PORT_NJACK_SWITCH, njack_handle); */
 
         heur_dissector_add("udp", dissect_njack_heur, proto_njack);
         /* heur_dissector_add("tcp", dissect_njack_heur, proto_njack); */
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index d758476648..58b559ca62 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -87,7 +87,7 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	} else {
 		proto_tree_add_uint(subtree, hf_3com_xns_type_ethertype,
 		    tvb, 0, 2, type);
-		if (!dissector_try_port(ethertype_subdissector_table,
+		if (!dissector_try_uint(ethertype_subdissector_table,
 		    type, next_tvb, pinfo, tree))
 			call_dissector(data_handle, next_tvb, pinfo, tree);
 	}
@@ -127,5 +127,5 @@ proto_reg_handoff_3com_xns(void)
 	ethertype_subdissector_table = find_dissector_table("ethertype");
 
 	our_xns_handle = create_dissector_handle(dissect_3com_xns, proto_3com_xns);
-	dissector_add("llc.dsap", 0x80, our_xns_handle);
+	dissector_add_uint("llc.dsap", 0x80, our_xns_handle);
 }
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 87018115ea..c0e0f35f5f 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -2148,5 +2148,5 @@ proto_reg_handoff_a11(void)
     dissector_handle_t a11_handle;
 
     a11_handle = find_dissector("a11");
-    dissector_add("udp.port", UDP_PORT_3GA11, a11_handle);
+    dissector_add_uint("udp.port", UDP_PORT_3GA11, a11_handle);
 }
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 842e7ef1a9..53e2b6fbf0 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -826,7 +826,7 @@ void proto_reg_handoff_9P(void)
 
 	ninep_handle = create_dissector_handle(dissect_9P, proto_9P);
 
-	dissector_add("tcp.port", NINEPORT, ninep_handle);
+	dissector_add_uint("tcp.port", NINEPORT, ninep_handle);
 }
 
 
diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c
index e44c3880bc..e75b64e278 100644
--- a/epan/dissectors/packet-HI2Operations.c
+++ b/epan/dissectors/packet-HI2Operations.c
@@ -598,8 +598,8 @@ static const value_string HI2Operations_IP_value_vals[] = {
 };
 
 static const ber_choice_t IP_value_choice[] = {
-  {   1, &hf_HI2Operations_iPBinaryAddress, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_4_16 },
-  {   2, &hf_HI2Operations_iPTextAddress, BER_CLASS_CON, 2, 0, dissect_HI2Operations_IA5String_SIZE_7_45 },
+  {   1, &hf_HI2Operations_iPBinaryAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_4_16 },
+  {   2, &hf_HI2Operations_iPTextAddress, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IA5String_SIZE_7_45 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -631,9 +631,9 @@ dissect_HI2Operations_T_iP_assignment(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 
 static const ber_sequence_t IPAddress_sequence[] = {
-  { &hf_HI2Operations_iP_type, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_iP_type },
-  { &hf_HI2Operations_iP_value, BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_IP_value },
-  { &hf_HI2Operations_iP_assignment, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_iP_assignment },
+  { &hf_HI2Operations_iP_type, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iP_type },
+  { &hf_HI2Operations_iP_value, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_IP_value },
+  { &hf_HI2Operations_iP_assignment, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iP_assignment },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -656,11 +656,11 @@ static const value_string HI2Operations_Network_Element_Identifier_vals[] = {
 };
 
 static const ber_choice_t Network_Element_Identifier_choice[] = {
-  {   1, &hf_HI2Operations_e164_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_x25_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_iP_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   4, &hf_HI2Operations_dNS_Format, BER_CLASS_CON, 4, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   5, &hf_HI2Operations_iP_Address, BER_CLASS_CON, 5, 0, dissect_HI2Operations_IPAddress },
+  {   1, &hf_HI2Operations_e164_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_x25_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_iP_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   4, &hf_HI2Operations_dNS_Format, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   5, &hf_HI2Operations_iP_Address, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IPAddress },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -675,8 +675,8 @@ dissect_HI2Operations_Network_Element_Identifier(gboolean implicit_tag _U_, tvbu
 
 
 static const ber_sequence_t Network_Identifier_sequence[] = {
-  { &hf_HI2Operations_operator_Identifier, BER_CLASS_CON, 0, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_5 },
-  { &hf_HI2Operations_network_Element_Identifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Network_Element_Identifier },
+  { &hf_HI2Operations_operator_Identifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_5 },
+  { &hf_HI2Operations_network_Element_Identifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Network_Element_Identifier },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -690,8 +690,8 @@ dissect_HI2Operations_Network_Identifier(gboolean implicit_tag _U_, tvbuff_t *tv
 
 
 static const ber_sequence_t CommunicationIdentifier_sequence[] = {
-  { &hf_HI2Operations_communication_Identity_Number, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_8 },
-  { &hf_HI2Operations_network_Identifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_Network_Identifier },
+  { &hf_HI2Operations_communication_Identity_Number, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_8 },
+  { &hf_HI2Operations_network_Identifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Network_Identifier },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -731,8 +731,8 @@ dissect_HI2Operations_T_winterSummerIndication(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t LocalTimeStamp_sequence[] = {
-  { &hf_HI2Operations_generalizedTime, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeneralizedTime },
-  { &hf_HI2Operations_winterSummerIndication, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_winterSummerIndication },
+  { &hf_HI2Operations_generalizedTime, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeneralizedTime },
+  { &hf_HI2Operations_winterSummerIndication, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_winterSummerIndication },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -761,8 +761,8 @@ static const value_string HI2Operations_TimeStamp_vals[] = {
 };
 
 static const ber_choice_t TimeStamp_choice[] = {
-  {   0, &hf_HI2Operations_localTime, BER_CLASS_CON, 0, 0, dissect_HI2Operations_LocalTimeStamp },
-  {   1, &hf_HI2Operations_utcTime, BER_CLASS_CON, 1, 0, dissect_HI2Operations_UTCTime },
+  {   0, &hf_HI2Operations_localTime, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocalTimeStamp },
+  {   1, &hf_HI2Operations_utcTime, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -871,10 +871,10 @@ dissect_HI2Operations_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t T_ms_Loc_sequence[] = {
-  { &hf_HI2Operations_mcc   , BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_1023 },
-  { &hf_HI2Operations_mnc   , BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER_0_16383 },
-  { &hf_HI2Operations_lai   , BER_CLASS_CON, 3, 0, dissect_HI2Operations_INTEGER_0_65535 },
-  { &hf_HI2Operations_ci    , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_mcc   , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_1023 },
+  { &hf_HI2Operations_mnc   , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_16383 },
+  { &hf_HI2Operations_lai   , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_65535 },
+  { &hf_HI2Operations_ci    , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -894,8 +894,8 @@ static const value_string HI2Operations_TetraLocation_vals[] = {
 };
 
 static const ber_choice_t TetraLocation_choice[] = {
-  {   1, &hf_HI2Operations_ms_Loc, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_ms_Loc },
-  {   2, &hf_HI2Operations_ls_Loc, BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER },
+  {   1, &hf_HI2Operations_ms_Loc, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_ms_Loc },
+  {   2, &hf_HI2Operations_ls_Loc, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -969,10 +969,10 @@ dissect_HI2Operations_INTEGER_0_359(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t T_geoCoordinates_sequence[] = {
-  { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_7_10 },
-  { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_8_11 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
-  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_0_359 },
+  { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7_10 },
+  { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_8_11 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_359 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1008,10 +1008,10 @@ dissect_HI2Operations_PrintableString_SIZE_7(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_utmCoordinates_sequence[] = {
-  { &hf_HI2Operations_utm_East, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_10 },
-  { &hf_HI2Operations_utm_North, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_7 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
-  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_0_359 },
+  { &hf_HI2Operations_utm_East, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_10 },
+  { &hf_HI2Operations_utm_North, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_359 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1036,8 +1036,8 @@ dissect_HI2Operations_PrintableString_SIZE_13(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t T_utmRefCoordinates_sequence[] = {
-  { &hf_HI2Operations_utmref_string, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_13 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_utmref_string, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_13 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1069,10 +1069,10 @@ static const value_string HI2Operations_GSMLocation_vals[] = {
 };
 
 static const ber_choice_t GSMLocation_choice[] = {
-  {   1, &hf_HI2Operations_geoCoordinates, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_geoCoordinates },
-  {   2, &hf_HI2Operations_utmCoordinates, BER_CLASS_CON, 2, 0, dissect_HI2Operations_T_utmCoordinates },
-  {   3, &hf_HI2Operations_utmRefCoordinates, BER_CLASS_CON, 3, 0, dissect_HI2Operations_T_utmRefCoordinates },
-  {   4, &hf_HI2Operations_wGS84Coordinates, BER_CLASS_CON, 4, 0, dissect_HI2Operations_OCTET_STRING },
+  {   1, &hf_HI2Operations_geoCoordinates, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_geoCoordinates },
+  {   2, &hf_HI2Operations_utmCoordinates, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_utmCoordinates },
+  {   3, &hf_HI2Operations_utmRefCoordinates, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_utmRefCoordinates },
+  {   4, &hf_HI2Operations_wGS84Coordinates, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1123,9 +1123,9 @@ dissect_HI2Operations_INTEGER_M8388608_8388607(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t GeographicalCoordinates_sequence[] = {
-  { &hf_HI2Operations_latitudeSign, BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_latitudeSign },
-  { &hf_HI2Operations_latitude_01, BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_8388607 },
-  { &hf_HI2Operations_longitude_01, BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER_M8388608_8388607 },
+  { &hf_HI2Operations_latitudeSign, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_latitudeSign },
+  { &hf_HI2Operations_latitude_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_8388607 },
+  { &hf_HI2Operations_longitude_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_M8388608_8388607 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1139,7 +1139,7 @@ dissect_HI2Operations_GeographicalCoordinates(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t GA_Point_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1163,8 +1163,8 @@ dissect_HI2Operations_INTEGER_0_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t GA_PointWithUnCertainty_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
-  { &hf_HI2Operations_uncertaintyCode, BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_127 },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_uncertaintyCode, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_127 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1178,7 +1178,7 @@ dissect_HI2Operations_GA_PointWithUnCertainty(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t GA_Polygon_item_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1212,9 +1212,9 @@ static const value_string HI2Operations_UMTSLocation_vals[] = {
 };
 
 static const ber_choice_t UMTSLocation_choice[] = {
-  {   1, &hf_HI2Operations_point , BER_CLASS_CON, 1, 0, dissect_HI2Operations_GA_Point },
-  {   2, &hf_HI2Operations_pointWithUnCertainty, BER_CLASS_CON, 2, 0, dissect_HI2Operations_GA_PointWithUnCertainty },
-  {   3, &hf_HI2Operations_polygon, BER_CLASS_CON, 3, 0, dissect_HI2Operations_GA_Polygon },
+  {   1, &hf_HI2Operations_point , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_Point },
+  {   2, &hf_HI2Operations_pointWithUnCertainty, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_PointWithUnCertainty },
+  {   3, &hf_HI2Operations_polygon, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_Polygon },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1239,14 +1239,14 @@ dissect_HI2Operations_OCTET_STRING_SIZE_7(gboolean implicit_tag _U_, tvbuff_t *t
 
 
 static const ber_sequence_t Location_sequence[] = {
-  { &hf_HI2Operations_e164_Number, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  { &hf_HI2Operations_globalCellID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_5_7 },
-  { &hf_HI2Operations_tetraLocation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TetraLocation },
-  { &hf_HI2Operations_rAI   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
-  { &hf_HI2Operations_gsmLocation, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_GSMLocation },
-  { &hf_HI2Operations_umtsLocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UMTSLocation },
-  { &hf_HI2Operations_sAI   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_7 },
-  { &hf_HI2Operations_oldRAI, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
+  { &hf_HI2Operations_e164_Number, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  { &hf_HI2Operations_globalCellID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_5_7 },
+  { &hf_HI2Operations_tetraLocation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TetraLocation },
+  { &hf_HI2Operations_rAI   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
+  { &hf_HI2Operations_gsmLocation, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_GSMLocation },
+  { &hf_HI2Operations_umtsLocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UMTSLocation },
+  { &hf_HI2Operations_sAI   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_7 },
+  { &hf_HI2Operations_oldRAI, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1315,9 +1315,9 @@ static const value_string HI2Operations_CallingPartyNumber_vals[] = {
 };
 
 static const ber_choice_t CallingPartyNumber_choice[] = {
-  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1339,9 +1339,9 @@ static const value_string HI2Operations_CalledPartyNumber_vals[] = {
 };
 
 static const ber_choice_t CalledPartyNumber_choice[] = {
-  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1366,15 +1366,15 @@ dissect_HI2Operations_OCTET_STRING_SIZE_1_9(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_partyIdentity_sequence[] = {
-  { &hf_HI2Operations_imei  , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_8 },
-  { &hf_HI2Operations_tei   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_15 },
-  { &hf_HI2Operations_imsi  , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3_8 },
-  { &hf_HI2Operations_callingPartyNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CallingPartyNumber },
-  { &hf_HI2Operations_calledPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
-  { &hf_HI2Operations_msISDN, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_9 },
-  { &hf_HI2Operations_e164_Format, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  { &hf_HI2Operations_sip_uri, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
-  { &hf_HI2Operations_tel_url, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_imei  , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_8 },
+  { &hf_HI2Operations_tei   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_15 },
+  { &hf_HI2Operations_imsi  , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3_8 },
+  { &hf_HI2Operations_callingPartyNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CallingPartyNumber },
+  { &hf_HI2Operations_calledPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
+  { &hf_HI2Operations_msISDN, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_9 },
+  { &hf_HI2Operations_e164_Format, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  { &hf_HI2Operations_sip_uri, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_tel_url, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1437,9 +1437,9 @@ dissect_HI2Operations_MAP_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t Services_Information_sequence[] = {
-  { &hf_HI2Operations_iSUP_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ISUP_parameters },
-  { &hf_HI2Operations_dSS1_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_parameters_codeset_0 },
-  { &hf_HI2Operations_mAP_parameters, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_parameters },
+  { &hf_HI2Operations_iSUP_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ISUP_parameters },
+  { &hf_HI2Operations_dSS1_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_parameters_codeset_0 },
+  { &hf_HI2Operations_mAP_parameters, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1570,15 +1570,15 @@ dissect_HI2Operations_MAP_SS_Invoke_Components(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t Standard_Supplementary_Services_sequence[] = {
-  { &hf_HI2Operations_iSUP_SS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ISUP_SS_parameters },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_0 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_4, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_4 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_5, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_5 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_6, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_6 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_7, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_7 },
-  { &hf_HI2Operations_dSS1_SS_Invoke_components, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_Invoke_Components },
-  { &hf_HI2Operations_mAP_SS_Parameters, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_SS_Parameters },
-  { &hf_HI2Operations_mAP_SS_Invoke_Components, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_SS_Invoke_Components },
+  { &hf_HI2Operations_iSUP_SS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ISUP_SS_parameters },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_0 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_4, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_4 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_5, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_5 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_6, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_6 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_7, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_7 },
+  { &hf_HI2Operations_dSS1_SS_Invoke_components, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_Invoke_Components },
+  { &hf_HI2Operations_mAP_SS_Parameters, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_SS_Parameters },
+  { &hf_HI2Operations_mAP_SS_Invoke_Components, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_SS_Invoke_Components },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1629,8 +1629,8 @@ static const value_string HI2Operations_Non_Standard_Supplementary_Services_item
 };
 
 static const ber_choice_t Non_Standard_Supplementary_Services_item_choice[] = {
-  {   1, &hf_HI2Operations_simpleIndication, BER_CLASS_CON, 1, 0, dissect_HI2Operations_SimpleIndication },
-  {   2, &hf_HI2Operations_sciData, BER_CLASS_CON, 2, 0, dissect_HI2Operations_SciDataMode },
+  {   1, &hf_HI2Operations_simpleIndication, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SimpleIndication },
+  {   2, &hf_HI2Operations_sciData, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SciDataMode },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1671,9 +1671,9 @@ dissect_HI2Operations_Other_Services(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t Supplementary_Services_sequence[] = {
-  { &hf_HI2Operations_standard_Supplementary_Services, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Standard_Supplementary_Services },
-  { &hf_HI2Operations_non_Standard_Supplementary_Services, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Non_Standard_Supplementary_Services },
-  { &hf_HI2Operations_other_Services, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Other_Services },
+  { &hf_HI2Operations_standard_Supplementary_Services, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Standard_Supplementary_Services },
+  { &hf_HI2Operations_non_Standard_Supplementary_Services, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Non_Standard_Supplementary_Services },
+  { &hf_HI2Operations_other_Services, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Other_Services },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1703,8 +1703,8 @@ static const value_string HI2Operations_DataNodeAddress_vals[] = {
 };
 
 static const ber_choice_t DataNodeAddress_choice[] = {
-  {   1, &hf_HI2Operations_ipAddress, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IPAddress },
-  {   2, &hf_HI2Operations_x25Address, BER_CLASS_CON, 2, 0, dissect_HI2Operations_X25Address },
+  {   1, &hf_HI2Operations_ipAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IPAddress },
+  {   2, &hf_HI2Operations_x25Address, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_X25Address },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1739,9 +1739,9 @@ dissect_HI2Operations_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *t
 
 
 static const ber_sequence_t GPRS_parameters_sequence[] = {
-  { &hf_HI2Operations_pDP_address_allocated_to_the_target, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_aPN   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_100 },
-  { &hf_HI2Operations_pDP_type, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_pDP_address_allocated_to_the_target, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_aPN   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_100 },
+  { &hf_HI2Operations_pDP_type, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1755,7 +1755,7 @@ dissect_HI2Operations_GPRS_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 
 static const ber_sequence_t Services_Data_Information_sequence[] = {
-  { &hf_HI2Operations_gPRS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRS_parameters },
+  { &hf_HI2Operations_gPRS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRS_parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1769,11 +1769,11 @@ dissect_HI2Operations_Services_Data_Information(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t PartyInformation_sequence[] = {
-  { &hf_HI2Operations_party_Qualifier, BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_party_Qualifier },
-  { &hf_HI2Operations_partyIdentity, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_partyIdentity },
-  { &hf_HI2Operations_services_Information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Services_Information },
-  { &hf_HI2Operations_supplementary_Services_Information, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Supplementary_Services },
-  { &hf_HI2Operations_services_Data_Information, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Services_Data_Information },
+  { &hf_HI2Operations_party_Qualifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_party_Qualifier },
+  { &hf_HI2Operations_partyIdentity, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_partyIdentity },
+  { &hf_HI2Operations_services_Information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Services_Information },
+  { &hf_HI2Operations_supplementary_Services_Information, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Supplementary_Services },
+  { &hf_HI2Operations_services_Data_Information, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Services_Data_Information },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1818,10 +1818,10 @@ dissect_HI2Operations_CCLink_State(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t CallContentLinkCharacteristics_sequence[] = {
-  { &hf_HI2Operations_cCLink_State, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CCLink_State },
-  { &hf_HI2Operations_release_Time, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_release_Reason, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
-  { &hf_HI2Operations_lEMF_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
+  { &hf_HI2Operations_cCLink_State, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCLink_State },
+  { &hf_HI2Operations_release_Time, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_release_Reason, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_lEMF_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1835,8 +1835,8 @@ dissect_HI2Operations_CallContentLinkCharacteristics(gboolean implicit_tag _U_,
 
 
 static const ber_sequence_t T_callContentLinkInformation_sequence[] = {
-  { &hf_HI2Operations_cCLink1Characteristics, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallContentLinkCharacteristics },
-  { &hf_HI2Operations_cCLink2Characteristics, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallContentLinkCharacteristics },
+  { &hf_HI2Operations_cCLink1Characteristics, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallContentLinkCharacteristics },
+  { &hf_HI2Operations_cCLink2Characteristics, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallContentLinkCharacteristics },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1932,10 +1932,10 @@ dissect_HI2Operations_OCTET_STRING_SIZE_1_270(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t T_sMS_Contents_sequence[] = {
-  { &hf_HI2Operations_initiator, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_initiator },
-  { &hf_HI2Operations_transfer_status, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_transfer_status },
-  { &hf_HI2Operations_other_message, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_other_message },
-  { &hf_HI2Operations_content, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_270 },
+  { &hf_HI2Operations_initiator, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_initiator },
+  { &hf_HI2Operations_transfer_status, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_transfer_status },
+  { &hf_HI2Operations_other_message, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_other_message },
+  { &hf_HI2Operations_content, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_270 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1949,9 +1949,9 @@ dissect_HI2Operations_T_sMS_Contents(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t SMS_report_sequence[] = {
-  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_CommunicationIdentifier },
-  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_sMS_Contents, BER_CLASS_CON, 3, 0, dissect_HI2Operations_T_sMS_Contents },
+  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CommunicationIdentifier },
+  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_sMS_Contents, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_sMS_Contents },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2036,8 +2036,8 @@ static const value_string HI2Operations_UmtsQos_vals[] = {
 };
 
 static const ber_choice_t UmtsQos_choice[] = {
-  {   1, &hf_HI2Operations_qosMobileRadio, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING },
-  {   2, &hf_HI2Operations_qosGn , BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING },
+  {   1, &hf_HI2Operations_qosMobileRadio, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  {   2, &hf_HI2Operations_qosGn , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2126,8 +2126,8 @@ static const value_string HI2Operations_LocationType_vals[] = {
 };
 
 static const ber_choice_t LocationType_choice[] = {
-  {   0, &hf_HI2Operations_geodeticData, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  {   1, &hf_HI2Operations_nameAddress, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_PrintableString_SIZE_1_100 },
+  {   0, &hf_HI2Operations_geodeticData, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  {   1, &hf_HI2Operations_nameAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_1_100 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2245,8 +2245,8 @@ dissect_HI2Operations_VisibleString_SIZE_1_15_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t CallId_sequence[] = {
-  { &hf_HI2Operations_sequencenumber, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_25_ },
-  { &hf_HI2Operations_systemidentity, BER_CLASS_CON, 1, 0, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_sequencenumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_25_ },
+  { &hf_HI2Operations_systemidentity, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2291,25 +2291,25 @@ dissect_HI2Operations_VisibleString_SIZE_1_48_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t PartyId_sequence[] = {
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved2, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved3, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved4, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved5, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_dn    , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
-  { &hf_HI2Operations_userProvided, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
-  { &hf_HI2Operations_reserved6, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved7, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_ipAddress_01, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_reserved8, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_trunkId, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_reserved9, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_genericAddress, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_genericDigits, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_genericName, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_48_ },
-  { &hf_HI2Operations_port  , BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_context, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved2, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved3, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved4, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved5, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_dn    , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_userProvided, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_reserved6, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved7, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_ipAddress_01, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved8, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_trunkId, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved9, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_genericAddress, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_genericDigits, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_genericName, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_48_ },
+  { &hf_HI2Operations_port  , BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_context, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2323,11 +2323,11 @@ dissect_HI2Operations_PartyId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t Answer_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_answering, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_answering, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2352,8 +2352,8 @@ dissect_HI2Operations_VisibleString_SIZE_1_20_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t T_sepCCCpair_sequence[] = {
-  { &hf_HI2Operations_sepXmitCCC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
-  { &hf_HI2Operations_sepRecvCCC, BER_CLASS_CON, 1, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  { &hf_HI2Operations_sepXmitCCC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  { &hf_HI2Operations_sepRecvCCC, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2373,8 +2373,8 @@ static const value_string HI2Operations_CCCId_vals[] = {
 };
 
 static const ber_choice_t CCCId_choice[] = {
-  {   0, &hf_HI2Operations_combCCC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
-  {   1, &hf_HI2Operations_sepCCCpair, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_sepCCCpair },
+  {   0, &hf_HI2Operations_combCCC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  {   1, &hf_HI2Operations_sepCCCpair, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_sepCCCpair },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2406,11 +2406,11 @@ dissect_HI2Operations_FlowDirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t CCClose_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 4, 0, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2443,8 +2443,8 @@ static const value_string HI2Operations_T_ccOpenOption_vals[] = {
 };
 
 static const ber_choice_t T_ccOpenOption_choice[] = {
-  {   3, &hf_HI2Operations_ccOpenTime, BER_CLASS_CON, 3, 0, dissect_HI2Operations_SEQUENCE_OF_CallId },
-  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, 0, dissect_HI2Operations_NULL },
+  {   3, &hf_HI2Operations_ccOpenTime, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_CallId },
+  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2470,14 +2470,14 @@ dissect_HI2Operations_SDP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 
 static const ber_sequence_t CCOpen_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
   { &hf_HI2Operations_ccOpenOption, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_T_ccOpenOption },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 5, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 8, 0, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2497,8 +2497,8 @@ static const value_string HI2Operations_T_input_vals[] = {
 };
 
 static const ber_choice_t T_input_choice[] = {
-  {   6, &hf_HI2Operations_userinput, BER_CLASS_CON, 6, 0, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  {   7, &hf_HI2Operations_translationinput, BER_CLASS_CON, 7, 0, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  {   6, &hf_HI2Operations_userinput, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  {   7, &hf_HI2Operations_translationinput, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2524,15 +2524,15 @@ dissect_HI2Operations_TransitCarrierId(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 
 static const ber_sequence_t Origination_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, 0, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { &hf_HI2Operations_input , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_T_input },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 8, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TransitCarrierId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TransitCarrierId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2546,16 +2546,16 @@ dissect_HI2Operations_Origination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t Redirection_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_old   , BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_redirectedto, BER_CLASS_CON, 4, 0, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TransitCarrierId },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 7, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_new   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_redirectedfrom, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_old   , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_redirectedto, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TransitCarrierId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_new   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_redirectedfrom, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2569,10 +2569,10 @@ dissect_HI2Operations_Redirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t Release_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2596,9 +2596,9 @@ dissect_HI2Operations_INTEGER_1_100_(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t RedirectedFromInfo_sequence[] = {
-  { &hf_HI2Operations_lastRedirecting, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_originalCalled, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_numRedirections, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_1_100_ },
+  { &hf_HI2Operations_lastRedirecting, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_originalCalled, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_numRedirections, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_1_100_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2612,14 +2612,14 @@ dissect_HI2Operations_RedirectedFromInfo(gboolean implicit_tag _U_, tvbuff_t *tv
 
 
 static const ber_sequence_t TerminationAttempt_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_redirectedFromInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_RedirectedFromInfo },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_redirectedFromInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_RedirectedFromInfo },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2649,15 +2649,15 @@ dissect_HI2Operations_ResourceState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t CCChange_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 4, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 7, 0, dissect_HI2Operations_FlowDirection },
-  { &hf_HI2Operations_resourceState, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ResourceState },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_resourceState, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ResourceState },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2759,15 +2759,15 @@ dissect_HI2Operations_VisibleString_SIZE_1_40_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t TerminalDisplayInfo_sequence[] = {
-  { &hf_HI2Operations_generalDisplay, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_80_ },
-  { &hf_HI2Operations_calledNumber, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_callingNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_callingName, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_originalCalledNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_lastRedirectingNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_redirectingName, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_redirectingReason, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_messageWaitingNotif, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_generalDisplay, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_80_ },
+  { &hf_HI2Operations_calledNumber, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_callingNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_callingName, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_originalCalledNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_lastRedirectingNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_redirectingName, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_redirectingReason, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_messageWaitingNotif, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2792,14 +2792,14 @@ dissect_HI2Operations_VisibleString_SIZE_1_128_(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t NetworkSignal_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_alertingSignal, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_AlertingSignal },
-  { &hf_HI2Operations_subjectAudibleSignal, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_AudibleSignal },
-  { &hf_HI2Operations_terminalDisplayInfo, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TerminalDisplayInfo },
-  { &hf_HI2Operations_other , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_alertingSignal, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AlertingSignal },
+  { &hf_HI2Operations_subjectAudibleSignal, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AudibleSignal },
+  { &hf_HI2Operations_terminalDisplayInfo, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TerminalDisplayInfo },
+  { &hf_HI2Operations_other , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2813,10 +2813,10 @@ dissect_HI2Operations_NetworkSignal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t T_signal_sequence[] = {
-  { &hf_HI2Operations_switchhookFlash, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_dialedDigits, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_featureKey, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_otherSignalingInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_switchhookFlash, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_dialedDigits, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_featureKey, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_otherSignalingInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2830,11 +2830,11 @@ dissect_HI2Operations_T_signal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t SubjectSignal_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_signal, BER_CLASS_CON, 4, 0, dissect_HI2Operations_T_signal },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_signal, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_signal },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2848,12 +2848,12 @@ dissect_HI2Operations_SubjectSignal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t MediaReport_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2867,16 +2867,16 @@ dissect_HI2Operations_MediaReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t ServiceInstance_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_relatedCallId, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_serviceName, BER_CLASS_CON, 5, 0, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_firstCallCalling, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_secondCallCalling, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_relatedCallId, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_serviceName, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_firstCallCalling, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_secondCallCalling, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2913,25 +2913,25 @@ static const value_string HI2Operations_Message_vals[] = {
 };
 
 static const ber_choice_t Message_choice[] = {
-  {   1, &hf_HI2Operations_answer, BER_CLASS_CON, 1, 0, dissect_HI2Operations_Answer },
-  {   2, &hf_HI2Operations_ccclose, BER_CLASS_CON, 2, 0, dissect_HI2Operations_CCClose },
-  {   3, &hf_HI2Operations_ccopen, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CCOpen },
-  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, 0, dissect_HI2Operations_NULL },
-  {   5, &hf_HI2Operations_origination, BER_CLASS_CON, 5, 0, dissect_HI2Operations_Origination },
-  {   6, &hf_HI2Operations_reserved1, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  {   7, &hf_HI2Operations_redirection, BER_CLASS_CON, 7, 0, dissect_HI2Operations_Redirection },
-  {   8, &hf_HI2Operations_release, BER_CLASS_CON, 8, 0, dissect_HI2Operations_Release },
-  {   9, &hf_HI2Operations_reserved2, BER_CLASS_CON, 9, 0, dissect_HI2Operations_NULL },
-  {  10, &hf_HI2Operations_terminationattempt, BER_CLASS_CON, 10, 0, dissect_HI2Operations_TerminationAttempt },
-  {  11, &hf_HI2Operations_reserved, BER_CLASS_CON, 11, 0, dissect_HI2Operations_NULL },
-  {  12, &hf_HI2Operations_ccchange, BER_CLASS_CON, 12, 0, dissect_HI2Operations_CCChange },
-  {  13, &hf_HI2Operations_reserved3, BER_CLASS_CON, 13, 0, dissect_HI2Operations_NULL },
-  {  14, &hf_HI2Operations_reserved4, BER_CLASS_CON, 14, 0, dissect_HI2Operations_NULL },
-  {  15, &hf_HI2Operations_reserved5, BER_CLASS_CON, 15, 0, dissect_HI2Operations_NULL },
-  {  16, &hf_HI2Operations_networksignal, BER_CLASS_CON, 16, 0, dissect_HI2Operations_NetworkSignal },
-  {  17, &hf_HI2Operations_subjectsignal, BER_CLASS_CON, 17, 0, dissect_HI2Operations_SubjectSignal },
-  {  18, &hf_HI2Operations_mediareport, BER_CLASS_CON, 18, 0, dissect_HI2Operations_MediaReport },
-  {  19, &hf_HI2Operations_serviceinstance, BER_CLASS_CON, 19, 0, dissect_HI2Operations_ServiceInstance },
+  {   1, &hf_HI2Operations_answer, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Answer },
+  {   2, &hf_HI2Operations_ccclose, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCClose },
+  {   3, &hf_HI2Operations_ccopen, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCOpen },
+  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {   5, &hf_HI2Operations_origination, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Origination },
+  {   6, &hf_HI2Operations_reserved1, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {   7, &hf_HI2Operations_redirection, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Redirection },
+  {   8, &hf_HI2Operations_release, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Release },
+  {   9, &hf_HI2Operations_reserved2, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  10, &hf_HI2Operations_terminationattempt, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TerminationAttempt },
+  {  11, &hf_HI2Operations_reserved, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  12, &hf_HI2Operations_ccchange, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCChange },
+  {  13, &hf_HI2Operations_reserved3, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  14, &hf_HI2Operations_reserved4, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  15, &hf_HI2Operations_reserved5, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  16, &hf_HI2Operations_networksignal, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NetworkSignal },
+  {  17, &hf_HI2Operations_subjectsignal, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SubjectSignal },
+  {  18, &hf_HI2Operations_mediareport, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MediaReport },
+  {  19, &hf_HI2Operations_serviceinstance, BER_CLASS_CON, 19, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ServiceInstance },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2946,8 +2946,8 @@ dissect_HI2Operations_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t CdcPdu_sequence[] = {
-  { &hf_HI2Operations_protocolVersion, BER_CLASS_CON, 0, 0, dissect_HI2Operations_ProtocolVersion },
-  { &hf_HI2Operations_message, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Message },
+  { &hf_HI2Operations_protocolVersion, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ProtocolVersion },
+  { &hf_HI2Operations_message, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Message },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2968,9 +2968,9 @@ static const value_string HI2Operations_UserSignalType_vals[] = {
 };
 
 static const ber_choice_t UserSignalType_choice[] = {
-  {   0, &hf_HI2Operations_copySignal, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  {   1, &hf_HI2Operations_interpretedSignal, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  {   2, &hf_HI2Operations_cdcPdu, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CdcPdu },
+  {   0, &hf_HI2Operations_copySignal, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  {   1, &hf_HI2Operations_interpretedSignal, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  {   2, &hf_HI2Operations_cdcPdu, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CdcPdu },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2985,15 +2985,15 @@ dissect_HI2Operations_UserSignalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t TARGETACTIVITYMONITOR_1_sequence[] = {
-  { &hf_HI2Operations_version, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_lIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LIIDType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetLocation, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType },
-  { &hf_HI2Operations_direction, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_DirectionType },
-  { &hf_HI2Operations_iRITransaction, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_IRITransactionType },
-  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_userSignal, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UserSignalType },
-  { &hf_HI2Operations_cryptoCheckSum, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_version, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_lIInstanceid, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LIIDType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetLocation, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType },
+  { &hf_HI2Operations_direction, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_DirectionType },
+  { &hf_HI2Operations_iRITransaction, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRITransactionType },
+  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_userSignal, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UserSignalType },
+  { &hf_HI2Operations_cryptoCheckSum, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3036,8 +3036,8 @@ dissect_HI2Operations_T_cc(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static const ber_sequence_t IRI_to_CC_Correlation_sequence[] = {
-  { &hf_HI2Operations_cc    , BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_cc },
-  { &hf_HI2Operations_iri   , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_cc    , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_cc },
+  { &hf_HI2Operations_iri   , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3061,8 +3061,8 @@ dissect_HI2Operations_IRI_to_IRI_Correlation(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_both_IRI_CC_sequence[] = {
-  { &hf_HI2Operations_iri_CC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRI_to_CC_Correlation },
-  { &hf_HI2Operations_iri_IRI, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_to_IRI_Correlation },
+  { &hf_HI2Operations_iri_CC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_CC_Correlation },
+  { &hf_HI2Operations_iri_IRI, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_IRI_Correlation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3083,9 +3083,9 @@ static const value_string HI2Operations_CorrelationValues_vals[] = {
 };
 
 static const ber_choice_t CorrelationValues_choice[] = {
-  {   0, &hf_HI2Operations_iri_to_CC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRI_to_CC_Correlation },
-  {   1, &hf_HI2Operations_iri_to_iri, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_to_IRI_Correlation },
-  {   2, &hf_HI2Operations_both_IRI_CC, BER_CLASS_CON, 2, 0, dissect_HI2Operations_T_both_IRI_CC },
+  {   0, &hf_HI2Operations_iri_to_CC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_CC_Correlation },
+  {   1, &hf_HI2Operations_iri_to_iri, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_IRI_Correlation },
+  {   2, &hf_HI2Operations_both_IRI_CC, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_both_IRI_CC },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3155,10 +3155,10 @@ dissect_HI2Operations_CellIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 
 static const ber_sequence_t TETRACGIType_sequence[] = {
-  { &hf_HI2Operations_mcc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MCCType },
-  { &hf_HI2Operations_mnc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MNCType },
-  { &hf_HI2Operations_lai_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LocationAreaType },
-  { &hf_HI2Operations_cI    , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CellIdType },
+  { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType },
+  { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType },
+  { &hf_HI2Operations_lai_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocationAreaType },
+  { &hf_HI2Operations_cI    , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CellIdType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3183,9 +3183,9 @@ dissect_HI2Operations_SSIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t TSIType_sequence[] = {
-  { &hf_HI2Operations_mcc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MCCType },
-  { &hf_HI2Operations_mnc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MNCType },
-  { &hf_HI2Operations_ssi   , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SSIType },
+  { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType },
+  { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType },
+  { &hf_HI2Operations_ssi   , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SSIType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3253,12 +3253,12 @@ static const value_string HI2Operations_TETRAAddressType_vals[] = {
 };
 
 static const ber_choice_t TETRAAddressType_choice[] = {
-  {   0, &hf_HI2Operations_tETRAaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TSIType },
-  {   1, &hf_HI2Operations_pISNaddress, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_NumericString_SIZE_20 },
-  {   2, &hf_HI2Operations_iP4address, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING_SIZE_32 },
-  {   3, &hf_HI2Operations_iP6address, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING_SIZE_128 },
-  {   4, &hf_HI2Operations_e164address, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_NumericString_SIZE_20 },
-  {   5, &hf_HI2Operations_tEI   , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TEIType },
+  {   0, &hf_HI2Operations_tETRAaddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TSIType },
+  {   1, &hf_HI2Operations_pISNaddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NumericString_SIZE_20 },
+  {   2, &hf_HI2Operations_iP4address, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING_SIZE_32 },
+  {   3, &hf_HI2Operations_iP6address, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING_SIZE_128 },
+  {   4, &hf_HI2Operations_e164address, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NumericString_SIZE_20 },
+  {   5, &hf_HI2Operations_tEI   , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TEIType },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3279,8 +3279,8 @@ static const value_string HI2Operations_LocationType_en301040_vals[] = {
 };
 
 static const ber_choice_t LocationType_en301040_choice[] = {
-  {   0, &hf_HI2Operations_mSLoc , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TETRACGIType },
-  {   1, &hf_HI2Operations_lSLoc , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TETRAAddressType },
+  {   0, &hf_HI2Operations_mSLoc , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TETRACGIType },
+  {   1, &hf_HI2Operations_lSLoc , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TETRAAddressType },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3454,12 +3454,12 @@ dissect_HI2Operations_SSType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
 static const ber_sequence_t ActivityType_sequence[] = {
-  { &hf_HI2Operations_cctivity, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_ActivityClassType },
-  { &hf_HI2Operations_callRelation, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_callRelation },
-  { &hf_HI2Operations_direction_01, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_direction },
-  { &hf_HI2Operations_scope , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_scope },
-  { &hf_HI2Operations_cPlaneData, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { &hf_HI2Operations_sStype, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SSType },
+  { &hf_HI2Operations_cctivity, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ActivityClassType },
+  { &hf_HI2Operations_callRelation, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_callRelation },
+  { &hf_HI2Operations_direction_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_direction },
+  { &hf_HI2Operations_scope , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_scope },
+  { &hf_HI2Operations_cPlaneData, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_sStype, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SSType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3486,8 +3486,8 @@ dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType(gboolean implicit_tag _U_, tv
 
 
 static const ber_sequence_t AddressType_sequence[] = {
-  { &hf_HI2Operations_tSI   , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TSIType },
-  { &hf_HI2Operations_supplementaryAddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType },
+  { &hf_HI2Operations_tSI   , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TSIType },
+  { &hf_HI2Operations_supplementaryAddress, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3527,13 +3527,13 @@ dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040(gboolean implicit_tag _U
 
 
 static const ber_sequence_t TARGETACTIVITYMONITORind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetLocation_01, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
-  { &hf_HI2Operations_targetAction, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_ActivityType },
-  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_AddressType },
-  { &hf_HI2Operations_cotargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
-  { &hf_HI2Operations_cotargetlocation, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040 },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetLocation_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
+  { &hf_HI2Operations_targetAction, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ActivityType },
+  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AddressType },
+  { &hf_HI2Operations_cotargetaddress, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
+  { &hf_HI2Operations_cotargetlocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3571,13 +3571,13 @@ dissect_HI2Operations_SEQUENCE_OF_CircuitIdType(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t TARGETCOMMSMONITORind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetlocation, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
-  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_AddressType },
-  { &hf_HI2Operations_targetcommsid, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CircuitIdType },
-  { &hf_HI2Operations_cotargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
-  { &hf_HI2Operations_cotargetcommsid, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_CircuitIdType },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetlocation, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
+  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AddressType },
+  { &hf_HI2Operations_targetcommsid, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CircuitIdType },
+  { &hf_HI2Operations_cotargetaddress, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
+  { &hf_HI2Operations_cotargetcommsid, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_CircuitIdType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3591,8 +3591,8 @@ dissect_HI2Operations_TARGETCOMMSMONITORind(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t TTRAFFICind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_trafficPacket, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3606,8 +3606,8 @@ dissect_HI2Operations_TTRAFFICind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t CTTRAFFICind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_trafficPacket, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3632,7 +3632,7 @@ dissect_HI2Operations_PrintableString_SIZE_2(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t National_HI2_ASN1parameters_sequence[] = {
-  { &hf_HI2Operations_countryCode, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_2 },
+  { &hf_HI2Operations_countryCode, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_2 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3646,45 +3646,45 @@ dissect_HI2Operations_National_HI2_ASN1parameters(gboolean implicit_tag _U_, tvb
 
 
 static const ber_sequence_t IRI_Parameters_sequence[] = {
-  { &hf_HI2Operations_domainID, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OBJECT_IDENTIFIER },
-  { &hf_HI2Operations_iRIversion, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_iRIversion },
-  { &hf_HI2Operations_lawfulInterceptionIdentifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_LawfulInterceptionIdentifier },
-  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 2, 0, dissect_HI2Operations_CommunicationIdentifier },
-  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_intercepted_Call_Direct, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_intercepted_Call_Direct },
-  { &hf_HI2Operations_intercepted_Call_State, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Intercepted_Call_State },
-  { &hf_HI2Operations_ringingDuration, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
-  { &hf_HI2Operations_conversationDuration, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
-  { &hf_HI2Operations_locationOfTheTarget, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Location },
-  { &hf_HI2Operations_partyInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SET_SIZE_1_10_OF_PartyInformation },
-  { &hf_HI2Operations_callContentLinkInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_callContentLinkInformation },
-  { &hf_HI2Operations_release_Reason_Of_Intercepted_Call, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
-  { &hf_HI2Operations_nature_Of_The_intercepted_call, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_nature_Of_The_intercepted_call },
-  { &hf_HI2Operations_serverCenterAddress, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyInformation },
-  { &hf_HI2Operations_sMS   , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SMS_report },
-  { &hf_HI2Operations_cC_Link_Identifier, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CC_Link_Identifier },
-  { &hf_HI2Operations_national_Parameters, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL, dissect_HI2Operations_National_Parameters },
-  { &hf_HI2Operations_gPRSCorrelationNumber, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSCorrelationNumber },
-  { &hf_HI2Operations_gPRSevent, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSEvent },
-  { &hf_HI2Operations_sgsnAddress, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_gPRSOperationErrorCode, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSOperationErrorCode },
-  { &hf_HI2Operations_ggsnAddress, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_qOS   , BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UmtsQos },
-  { &hf_HI2Operations_networkIdentifier, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Network_Identifier },
-  { &hf_HI2Operations_sMSOriginatingAddress, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_sMSTerminatingAddress, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_iMSevent, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_HI2Operations_IMSevent },
-  { &hf_HI2Operations_sIPMessage, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
-  { &hf_HI2Operations_servingSGSN_number, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_20 },
-  { &hf_HI2Operations_servingSGSN_address, BER_CLASS_CON, 32, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_5_17 },
-  { &hf_HI2Operations_tARGETACTIVITYMONITOR, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETACTIVITYMONITOR_1 },
-  { &hf_HI2Operations_ldiEvent, BER_CLASS_CON, 34, BER_FLAGS_OPTIONAL, dissect_HI2Operations_LDIevent },
-  { &hf_HI2Operations_correlation, BER_CLASS_CON, 35, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CorrelationValues },
-  { &hf_HI2Operations_tARGETACTIVITYMONITORind, BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETACTIVITYMONITORind },
-  { &hf_HI2Operations_tARGETCOMMSMONITORind, BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETCOMMSMONITORind },
-  { &hf_HI2Operations_tTRAFFICind, BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TTRAFFICind },
-  { &hf_HI2Operations_cTTRAFFICind, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CTTRAFFICind },
-  { &hf_HI2Operations_national_HI2_ASN1parameters, BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL, dissect_HI2Operations_National_HI2_ASN1parameters },
+  { &hf_HI2Operations_domainID, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OBJECT_IDENTIFIER },
+  { &hf_HI2Operations_iRIversion, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iRIversion },
+  { &hf_HI2Operations_lawfulInterceptionIdentifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LawfulInterceptionIdentifier },
+  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CommunicationIdentifier },
+  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_intercepted_Call_Direct, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_intercepted_Call_Direct },
+  { &hf_HI2Operations_intercepted_Call_State, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Intercepted_Call_State },
+  { &hf_HI2Operations_ringingDuration, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
+  { &hf_HI2Operations_conversationDuration, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
+  { &hf_HI2Operations_locationOfTheTarget, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Location },
+  { &hf_HI2Operations_partyInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SET_SIZE_1_10_OF_PartyInformation },
+  { &hf_HI2Operations_callContentLinkInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_callContentLinkInformation },
+  { &hf_HI2Operations_release_Reason_Of_Intercepted_Call, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_nature_Of_The_intercepted_call, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_nature_Of_The_intercepted_call },
+  { &hf_HI2Operations_serverCenterAddress, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyInformation },
+  { &hf_HI2Operations_sMS   , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SMS_report },
+  { &hf_HI2Operations_cC_Link_Identifier, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CC_Link_Identifier },
+  { &hf_HI2Operations_national_Parameters, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_National_Parameters },
+  { &hf_HI2Operations_gPRSCorrelationNumber, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSCorrelationNumber },
+  { &hf_HI2Operations_gPRSevent, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSEvent },
+  { &hf_HI2Operations_sgsnAddress, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_gPRSOperationErrorCode, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSOperationErrorCode },
+  { &hf_HI2Operations_ggsnAddress, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_qOS   , BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UmtsQos },
+  { &hf_HI2Operations_networkIdentifier, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Network_Identifier },
+  { &hf_HI2Operations_sMSOriginatingAddress, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_sMSTerminatingAddress, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_iMSevent, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_IMSevent },
+  { &hf_HI2Operations_sIPMessage, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_servingSGSN_number, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_20 },
+  { &hf_HI2Operations_servingSGSN_address, BER_CLASS_CON, 32, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_5_17 },
+  { &hf_HI2Operations_tARGETACTIVITYMONITOR, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETACTIVITYMONITOR_1 },
+  { &hf_HI2Operations_ldiEvent, BER_CLASS_CON, 34, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_LDIevent },
+  { &hf_HI2Operations_correlation, BER_CLASS_CON, 35, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CorrelationValues },
+  { &hf_HI2Operations_tARGETACTIVITYMONITORind, BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETACTIVITYMONITORind },
+  { &hf_HI2Operations_tARGETCOMMSMONITORind, BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETCOMMSMONITORind },
+  { &hf_HI2Operations_tTRAFFICind, BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TTRAFFICind },
+  { &hf_HI2Operations_cTTRAFFICind, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CTTRAFFICind },
+  { &hf_HI2Operations_national_HI2_ASN1parameters, BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_National_HI2_ASN1parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3706,10 +3706,10 @@ static const value_string HI2Operations_IRIContent_vals[] = {
 };
 
 static const ber_choice_t IRIContent_choice[] = {
-  {   1, &hf_HI2Operations_iRI_Begin_record, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_Parameters },
-  {   2, &hf_HI2Operations_iRI_End_record, BER_CLASS_CON, 2, 0, dissect_HI2Operations_IRI_Parameters },
-  {   3, &hf_HI2Operations_iRI_Continue_record, BER_CLASS_CON, 3, 0, dissect_HI2Operations_IRI_Parameters },
-  {   4, &hf_HI2Operations_iRI_Report_record, BER_CLASS_CON, 4, 0, dissect_HI2Operations_IRI_Parameters },
+  {   1, &hf_HI2Operations_iRI_Begin_record, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   2, &hf_HI2Operations_iRI_End_record, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   3, &hf_HI2Operations_iRI_Continue_record, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   4, &hf_HI2Operations_iRI_Report_record, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3743,8 +3743,8 @@ static const value_string HI2Operations_IRIsContent_vals[] = {
 };
 
 static const ber_choice_t IRIsContent_choice[] = {
-  {   0, &hf_HI2Operations_iRIContent, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRIContent },
-  {   1, &hf_HI2Operations_iRISequence, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRISequence },
+  {   0, &hf_HI2Operations_iRIContent, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRIContent },
+  {   1, &hf_HI2Operations_iRISequence, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRISequence },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 56deac431d..adbe113972 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -349,6 +349,6 @@ proto_reg_handoff_aarp(void)
   dissector_handle_t aarp_handle;
 
   aarp_handle = create_dissector_handle(dissect_aarp, proto_aarp);
-  dissector_add("ethertype", ETHERTYPE_AARP, aarp_handle);
-  dissector_add("chdlctype", ETHERTYPE_AARP, aarp_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_AARP, aarp_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_AARP, aarp_handle);
 }
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 269b7352ab..634f32f3ea 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -68,7 +68,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
 	line = tvb_get_ptr(tvb, offset, linelen);
 
-	if (pinfo->match_port == pinfo->destport)
+	if (pinfo->match_uint == pinfo->destport)
 		is_request = TRUE;
 	else
 		is_request = FALSE;
@@ -187,5 +187,5 @@ proto_reg_handoff_acap(void)
 	dissector_handle_t acap_handle;
 
 	acap_handle = create_dissector_handle(dissect_acap, proto_acap);
-	dissector_add("tcp.port", TCP_PORT_ACAP, acap_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_ACAP, acap_handle);
 }
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index 5381328fc0..3d73f93939 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -831,12 +831,12 @@ void proto_reg_handoff_actrace(void)
 	}
 	else
 	{
-		dissector_delete("udp.port", actrace_udp_port, actrace_handle);
+		dissector_delete_uint("udp.port", actrace_udp_port, actrace_handle);
 	}
 
 	/* Set our port number for future use */
 	actrace_udp_port = global_actrace_udp_port;
 
-	dissector_add("udp.port", global_actrace_udp_port, actrace_handle);
+	dissector_add_uint("udp.port", global_actrace_udp_port, actrace_handle);
 }
 
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 27b4237676..a76377d342 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -1448,9 +1448,9 @@ proto_reg_handoff_adwin(void)
 		adwin_handle = new_create_dissector_handle(dissect_adwin, proto_adwin);
 		adwin_prefs_initialized = TRUE;
 	} else {
-		dissector_delete("udp.port", udp_port, adwin_handle);
+		dissector_delete_uint("udp.port", udp_port, adwin_handle);
 	}
 
 	udp_port = global_adwin_udp_port;
-	dissector_add("udp.port", global_adwin_udp_port, adwin_handle);
+	dissector_add_uint("udp.port", global_adwin_udp_port, adwin_handle);
 }
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index a0369dc370..0d7e45df4f 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -1161,9 +1161,9 @@ proto_reg_handoff_agentx(void)
 		agentx_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", agentx_tcp_port, agentx_handle);
+		dissector_delete_uint("tcp.port", agentx_tcp_port, agentx_handle);
 	}
 
 	agentx_tcp_port = global_agentx_tcp_port;
-	dissector_add("tcp.port", agentx_tcp_port, agentx_handle);
+	dissector_add_uint("tcp.port", agentx_tcp_port, agentx_handle);
 }
diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index e17da74d2c..c2973e797a 100644
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
@@ -106,5 +106,5 @@ proto_reg_handoff_aim_oft(void)
 
   /* FIXME 
   aim_handle = new_create_dissector_handle(dissect_aim, proto_aim);
-  dissector_add("tcp.port", TCP_PORT_AIM, aim_handle);*/
+  dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle);*/
 }
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 90140b4d0f..3a8dfb6f92 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -1746,5 +1746,5 @@ proto_reg_handoff_aim(void)
 	dissector_handle_t aim_handle;
 
 	aim_handle = new_create_dissector_handle(dissect_aim, proto_aim);
-	dissector_add("tcp.port", TCP_PORT_AIM, aim_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle);
 }
diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c
index b4ab7e239c..7bb670d6d0 100644
--- a/epan/dissectors/packet-airopeek.c
+++ b/epan/dissectors/packet-airopeek.c
@@ -138,5 +138,5 @@ proto_reg_handoff_airopeek(void)
   ieee80211_handle = find_dissector("wlan_datapad");
 
   airopeek_handle = create_dissector_handle(dissect_airopeek, proto_airopeek);
-  dissector_add("udp.port", 5000, airopeek_handle);
+  dissector_add_uint("udp.port", 5000, airopeek_handle);
 }
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 65e69d9c56..4e164e0d7c 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -874,5 +874,5 @@ proto_reg_handoff_ajp13(void)
 {
   dissector_handle_t ajp13_handle;
   ajp13_handle = create_dissector_handle(dissect_ajp13, proto_ajp13);
-  dissector_add("tcp.port", 8009, ajp13_handle);
+  dissector_add_uint("tcp.port", 8009, ajp13_handle);
 }
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index fd9b184dce..38ff09a51b 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -1798,5 +1798,5 @@ proto_reg_handoff_alcap(void)
 {
     dissector_handle_t alcap_handle = create_dissector_handle(dissect_alcap, proto_alcap);
 
-    dissector_add("mtp3.service_indicator", ALCAP_SI, alcap_handle);
+    dissector_add_uint("mtp3.service_indicator", ALCAP_SI, alcap_handle);
 }
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 8b247017fb..e70d706838 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -5237,6 +5237,6 @@ proto_register_amqp(void)
 void
 proto_reg_handoff_amqp(void)
 {
-    dissector_add("tcp.port", amqp_port,
+    dissector_add_uint("tcp.port", amqp_port,
         create_dissector_handle(dissect_amqp, proto_amqp));
 }
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 017ee7d2c1..71b61e5a67 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -648,18 +648,18 @@ proto_reg_handoff_amr(void)
 				dissector_add_string("h245.gef.content", ftr->id, new_create_dissector_handle(ftr->content_pdu, proto_amr));
 		}
 		/*	Activate the next line for testing with the randpkt tool
-			dissector_add("udp.port", 55555, amr_handle); 
+			dissector_add_uint("udp.port", 55555, amr_handle); 
 		*/
 		amr_prefs_initialized = TRUE;
 	} else {
 		if ( dynamic_payload_type > 95 )
-			dissector_delete("rtp.pt", dynamic_payload_type, amr_handle);
+			dissector_delete_uint("rtp.pt", dynamic_payload_type, amr_handle);
 	}
 
 	dynamic_payload_type = temp_dynamic_payload_type;
 
 	if ( dynamic_payload_type > 95 ){
-		dissector_add("rtp.pt", dynamic_payload_type, amr_handle);
+		dissector_add_uint("rtp.pt", dynamic_payload_type, amr_handle);
 	}
 	
 }
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c
index d4400b137c..9a5324e6eb 100644
--- a/epan/dissectors/packet-ancp.c
+++ b/epan/dissectors/packet-ancp.c
@@ -945,7 +945,7 @@ proto_reg_handoff_ancp(void)
     dissector_handle_t ancp_handle;
 
     ancp_handle = create_dissector_handle(dissect_ancp, proto_ancp);
-    dissector_add("tcp.port", ANCP_PORT, ancp_handle);
+    dissector_add_uint("tcp.port", ANCP_PORT, ancp_handle);
     stats_tree_register("ancp", "ancp", "ANCP", 0,
             ancp_stats_tree_packet, ancp_stats_tree_init, NULL);
 }
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index 7bf8f33695..255980a415 100644
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
@@ -146,6 +146,6 @@ proto_reg_handoff_ans(void)
 	dissector_handle_t ans_handle;
 
 	ans_handle = create_dissector_handle(dissect_ans, proto_ans);
-	dissector_add("ethertype", ETHERTYPE_INTEL_ANS, ans_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_INTEL_ANS, ans_handle);
 }
 
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 7d7d8c93e9..f732bc2ceb 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -1843,7 +1843,7 @@ trans_param_bearer_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offs
      */
     tele_tvb = tvb_new_subset(tvb, offset, len, len);
 
-    dissector_try_port(tele_dissector_table, ansi_637_trans_tele_id,
+    dissector_try_uint(tele_dissector_table, ansi_637_trans_tele_id,
 	tele_tvb, g_pinfo, g_tree);
 }
 
@@ -1967,7 +1967,7 @@ dissect_ansi_637_tele(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      */
     if (tree)
     {
-	value = pinfo->match_port;
+	value = pinfo->match_uint;
 
 	/*
 	 * create the ansi_637 protocol tree
@@ -2045,7 +2045,7 @@ dissect_ansi_637_tele(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		"%s - %s (%d)",
 		ansi_proto_name_tele,
 		str,
-		pinfo->match_port);
+		pinfo->match_uint);
 
 	ansi_637_tree =
 	    proto_item_add_subtree(ansi_637_item, ett_ansi_637_tele);
@@ -2351,18 +2351,18 @@ proto_reg_handoff_ansi_637(void)
 	/*
 	 * ANSI MAP dissector will push out teleservice ids
 	 */
-	dissector_add("ansi_map.tele_id", ansi_tele_id_strings[i].value, ansi_637_tele_handle);
+	dissector_add_uint("ansi_map.tele_id", ansi_tele_id_strings[i].value, ansi_637_tele_handle);
 
 	/*
 	 * we will push out teleservice ids after Transport layer decode
 	 */
-	dissector_add("ansi_637.tele_id", ansi_tele_id_strings[i].value, ansi_637_tele_handle);
+	dissector_add_uint("ansi_637.tele_id", ansi_tele_id_strings[i].value, ansi_637_tele_handle);
     }
 
     /*
      * ANSI A-interface will push out transport layer data
      */
-    dissector_add("ansi_a.sms", 0, ansi_637_trans_handle);
+    dissector_add_uint("ansi_a.sms", 0, ansi_637_trans_handle);
 
     /* data_handle = find_dissector("data"); */
 }
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 8caf3bf41e..cfe85b0cbd 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -4773,12 +4773,12 @@ dissect_ansi_683(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    proto_tree_add_protocol_format(tree, proto_ansi_683, tvb, 0, -1,
 		"%s %s Link",
 		ansi_proto_name,
-		(pinfo->match_port == ANSI_683_FORWARD) ? "Forward" : "Reverse");
+		(pinfo->match_uint == ANSI_683_FORWARD) ? "Forward" : "Reverse");
 
 	ansi_683_tree =
 	    proto_item_add_subtree(ansi_683_item, ett_ansi_683);
 
-	if (pinfo->match_port == ANSI_683_FORWARD)
+	if (pinfo->match_uint == ANSI_683_FORWARD)
 	{
 	    dissect_ansi_683_for_message(tvb, ansi_683_tree);
 	}
@@ -4865,10 +4865,10 @@ proto_reg_handoff_ansi_683(void)
 
     ansi_683_handle = create_dissector_handle(dissect_ansi_683, proto_ansi_683);
 
-    dissector_add("ansi_map.ota", ANSI_683_FORWARD, ansi_683_handle);
-    dissector_add("ansi_map.ota", ANSI_683_REVERSE, ansi_683_handle);
-    dissector_add("ansi_a.ota", ANSI_683_FORWARD, ansi_683_handle);
-    dissector_add("ansi_a.ota", ANSI_683_REVERSE, ansi_683_handle);
+    dissector_add_uint("ansi_map.ota", ANSI_683_FORWARD, ansi_683_handle);
+    dissector_add_uint("ansi_map.ota", ANSI_683_REVERSE, ansi_683_handle);
+    dissector_add_uint("ansi_a.ota", ANSI_683_FORWARD, ansi_683_handle);
+    dissector_add_uint("ansi_a.ota", ANSI_683_REVERSE, ansi_683_handle);
 
     data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 10110bbb56..ebe6d96ee1 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -2147,12 +2147,12 @@ dissect_ansi_801(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		proto_tree_add_protocol_format(tree, proto_ansi_801, tvb, 0, -1,
 		"%s %s Link",
 		ansi_proto_name,
-		(pinfo->match_port == ANSI_801_FORWARD) ? "Forward" : "Reverse");
+		(pinfo->match_uint == ANSI_801_FORWARD) ? "Forward" : "Reverse");
 
 	ansi_801_tree =
 		proto_item_add_subtree(ansi_801_item, ett_ansi_801);
 
-	if (pinfo->match_port == ANSI_801_FORWARD)
+	if (pinfo->match_uint == ANSI_801_FORWARD)
 	{
 		dissect_ansi_801_for_message(tvb, ansi_801_tree);
 	}
@@ -2409,10 +2409,10 @@ proto_reg_handoff_ansi_801(void)
 
 	ansi_801_handle = create_dissector_handle(dissect_ansi_801, proto_ansi_801);
 
-	dissector_add("ansi_map.pld", ANSI_801_FORWARD, ansi_801_handle);
-	dissector_add("ansi_map.pld", ANSI_801_REVERSE, ansi_801_handle);
-	dissector_add("ansi_a.pld", ANSI_801_FORWARD, ansi_801_handle);
-	dissector_add("ansi_a.pld", ANSI_801_REVERSE, ansi_801_handle);
+	dissector_add_uint("ansi_map.pld", ANSI_801_FORWARD, ansi_801_handle);
+	dissector_add_uint("ansi_map.pld", ANSI_801_REVERSE, ansi_801_handle);
+	dissector_add_uint("ansi_a.pld", ANSI_801_FORWARD, ansi_801_handle);
+	dissector_add_uint("ansi_a.pld", ANSI_801_REVERSE, ansi_801_handle);
 
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 195aa4be8a..c959f722df 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -5359,7 +5359,7 @@ elem_adds_user_part(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len,
     case ADDS_APP_SMS:
         adds_tvb = tvb_new_subset(tvb, curr_offset, len - 1, len - 1);
 
-        dissector_try_port(is637_dissector_table,
+        dissector_try_uint(is637_dissector_table,
             0, adds_tvb, g_pinfo, g_tree);
 
         curr_offset += (len - 1);
@@ -5368,7 +5368,7 @@ elem_adds_user_part(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len,
     case ADDS_APP_OTA:
         adds_tvb = tvb_new_subset(tvb, curr_offset, len - 1, len - 1);
 
-        dissector_try_port(is683_dissector_table,
+        dissector_try_uint(is683_dissector_table,
             (g_pinfo->p2p_dir == P2P_DIR_RECV), adds_tvb, g_pinfo, g_tree);
 
         curr_offset += (len - 1);
@@ -5377,7 +5377,7 @@ elem_adds_user_part(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len,
     case ADDS_APP_PDS:
         adds_tvb = tvb_new_subset(tvb, curr_offset, len - 1, len - 1);
 
-        dissector_try_port(is801_dissector_table,
+        dissector_try_uint(is801_dissector_table,
             (g_pinfo->p2p_dir == P2P_DIR_RECV), adds_tvb, g_pinfo, g_tree);
 
         curr_offset += (len - 1);
@@ -12233,8 +12233,8 @@ proto_reg_handoff_ansi_a(void)
         data_handle = find_dissector("data");
         rtp_handle = find_dissector("rtp");
 
-        dissector_add("bsap.pdu_type",  BSSAP_PDU_TYPE_BSMAP, bsmap_handle);
-        dissector_add("bsap.pdu_type",  BSSAP_PDU_TYPE_DTAP, dtap_handle);
+        dissector_add_uint("bsap.pdu_type",  BSSAP_PDU_TYPE_BSMAP, bsmap_handle);
+        dissector_add_uint("bsap.pdu_type",  BSSAP_PDU_TYPE_DTAP, dtap_handle);
 
         ansi_a_prefs_initialized = TRUE;
     }
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index f3080679f5..ccf779b12a 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -5490,10 +5490,10 @@ dissect_ansi_map_ServiceIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 			switch(ServiceIndicator){
 				case 1: /* CDMA OTASP Service */
 				case 3: /* CDMA OTAPA Service */
-					dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				case 4: /* CDMA Position Determination Service */
-					dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				default:
 					break;
@@ -10655,17 +10655,17 @@ dissect_ansi_map_SMS_BearerData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 		}
 		if (ansi_map_sms_tele_id != -1)
 		{
-			dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+			dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
 		}
 		else
 		{
 			switch(ServiceIndicator){
 				case 1: /* CDMA OTASP Service */
 				case 3: /* CDMA OTAPA Service */
-					dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				case 4: /* CDMA Position Determination Service */
-					dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+					dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
 					break;
 				default:
 					break;
@@ -10703,7 +10703,7 @@ dissect_ansi_map_SMS_TeleserviceIdentifier(gboolean implicit_tag _U_, tvbuff_t *
 		ansi_map_sms_tele_id = tvb_get_ntohs(tvb,0);
 		if ((ansi_map_sms_tele_id != -1)&&(SMS_BearerData_tvb !=NULL))
 		{
-		    dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+		    dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
 		}
 	}
 
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 0b49a68000..2759b5f6b0 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -198,12 +198,12 @@ static GHashTable* itu_sub_dissectors = NULL;
 
   extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
-    dissector_delete("sccp.ssn",ssn,tcap_handle);
+    dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 38e956830e..d3fcb7c985 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -1001,5 +1001,5 @@ proto_reg_handoff_aodv(void)
 
     aodv_handle = new_create_dissector_handle(dissect_aodv,
 					      proto_aodv);
-    dissector_add("udp.port", UDP_PORT_AODV, aodv_handle);
+    dissector_add_uint("udp.port", UDP_PORT_AODV, aodv_handle);
 }
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index a47da68747..f310cd37bf 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -499,6 +499,6 @@ proto_reg_handoff_aoe(void)
   dissector_handle_t aoe_handle;
 
   aoe_handle = find_dissector("aoe");
-  dissector_add("ethertype", ETHERTYPE_AOE, aoe_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_AOE, aoe_handle);
 
 }
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index d08cde5bb1..362ea56979 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -94,7 +94,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (tree)
     proto_tree_add_uint(fh_tree, hf_ap1394_type, tvb, 16, 2, etype);
   next_tvb = tvb_new_subset_remaining(tvb, 18);
-  if (!dissector_try_port(ethertype_subdissector_table, etype, next_tvb,
+  if (!dissector_try_uint(ethertype_subdissector_table, etype, next_tvb,
 		pinfo, tree))
     call_dissector(data_handle, next_tvb, pinfo, tree);
 }
@@ -133,5 +133,5 @@ proto_reg_handoff_ap1394(void)
   ethertype_subdissector_table = find_dissector_table("ethertype");
 
   ap1394_handle = create_dissector_handle(dissect_ap1394, proto_ap1394);
-  dissector_add("wtap_encap", WTAP_ENCAP_APPLE_IP_OVER_IEEE1394, ap1394_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_APPLE_IP_OVER_IEEE1394, ap1394_handle);
 }
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index a675c91239..2c57375180 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -241,7 +241,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
   next_tvb = tvb_new_subset_remaining (tvb, offset);
 
-  if (!dissector_try_port (arcnet_dissector_table, protID,
+  if (!dissector_try_uint (arcnet_dissector_table, protID,
 			   next_tvb, pinfo, tree))
     {
       if (check_col (pinfo->cinfo, COL_PROTOCOL))
@@ -362,10 +362,10 @@ proto_reg_handoff_arcnet (void)
   dissector_handle_t arcnet_handle, arcnet_linux_handle;
 
   arcnet_handle = create_dissector_handle (dissect_arcnet, proto_arcnet);
-  dissector_add ("wtap_encap", WTAP_ENCAP_ARCNET, arcnet_handle);
+  dissector_add_uint ("wtap_encap", WTAP_ENCAP_ARCNET, arcnet_handle);
 
   arcnet_linux_handle = create_dissector_handle (dissect_arcnet_linux,
 						 proto_arcnet);
-  dissector_add ("wtap_encap", WTAP_ENCAP_ARCNET_LINUX, arcnet_linux_handle);
+  dissector_add_uint ("wtap_encap", WTAP_ENCAP_ARCNET_LINUX, arcnet_linux_handle);
   data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 3483e010b0..7274e0907d 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -330,6 +330,6 @@ void proto_reg_handoff_armagetronad(void)
 
 	armagetronad_handle = find_dissector("armagetronad");
 
-	dissector_add("udp.port", UDP_PORT_ARMAGETRONAD, armagetronad_handle);
-	dissector_add("udp.port", UDP_PORT_MASTER, armagetronad_handle);
+	dissector_add_uint("udp.port", UDP_PORT_ARMAGETRONAD, armagetronad_handle);
+	dissector_add_uint("udp.port", UDP_PORT_MASTER, armagetronad_handle);
 }
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 8cc5f95d4f..a3d93d4e79 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -1352,9 +1352,9 @@ proto_reg_handoff_arp(void)
 
   arp_handle = find_dissector("arp");
 
-  dissector_add("ethertype", ETHERTYPE_ARP, arp_handle);
-  dissector_add("ethertype", ETHERTYPE_REVARP, arp_handle);
-  dissector_add("arcnet.protocol_id", ARCNET_PROTO_ARP_1051, arp_handle);
-  dissector_add("arcnet.protocol_id", ARCNET_PROTO_ARP_1201, arp_handle);
-  dissector_add("arcnet.protocol_id", ARCNET_PROTO_RARP_1201, arp_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_ARP, arp_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_REVARP, arp_handle);
+  dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_ARP_1051, arp_handle);
+  dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_ARP_1201, arp_handle);
+  dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_RARP_1201, arp_handle);
 }
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index 379b3e3c8b..2df800644f 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -2696,10 +2696,10 @@ proto_reg_handoff_artnet(void) {
     rdm_handle = find_dissector("rdm");
     artnet_initialized = TRUE;
   } else {
-    dissector_delete("udp.port",udp_port_artnet,artnet_handle);
+    dissector_delete_uint("udp.port",udp_port_artnet,artnet_handle);
   }
 
   udp_port_artnet = global_udp_port_artnet;
 
-  dissector_add("udp.port",global_udp_port_artnet,artnet_handle);
+  dissector_add_uint("udp.port",global_udp_port_artnet,artnet_handle);
 }
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 01383ae0d6..389642124a 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -153,7 +153,7 @@ proto_reg_handoff_aruba_adp(void)
   dissector_handle_t adp_handle;
 
   adp_handle = create_dissector_handle(dissect_aruba_adp, proto_aruba_adp);
-  dissector_add("udp.port", UDP_PORT_ADP, adp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_ADP, adp_handle);
 }
 
 
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index 6983aecaee..fa92de56cf 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -129,12 +129,12 @@ proto_register_aruba_erm(void)
 
 static void range_delete_callback (guint32 port)
 {
-    dissector_delete("udp.port", port, aruba_erm_handle);
+    dissector_delete_uint("udp.port", port, aruba_erm_handle);
 }
 
 static void range_add_callback (guint32 port)
 {
-    dissector_add("udp.port", port, aruba_erm_handle);
+    dissector_add_uint("udp.port", port, aruba_erm_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c
index 653d9e9a17..d9dfea1695 100644
--- a/epan/dissectors/packet-aruba-papi.c
+++ b/epan/dissectors/packet-aruba-papi.c
@@ -345,6 +345,6 @@ proto_reg_handoff_papi(void)
 	dissector_handle_t papi_handle;
 
 	papi_handle = new_create_dissector_handle(dissect_papi, proto_papi);
-	dissector_add("udp.port", UDP_PORT_PAPI, papi_handle);
+	dissector_add_uint("udp.port", UDP_PORT_PAPI, papi_handle);
  	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 325a3f8aa1..daa641e4ca 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -929,8 +929,8 @@ proto_reg_handoff_asap(void)
   dissector_handle_t asap_handle;
 
   asap_handle = create_dissector_handle(dissect_asap, proto_asap);
-  dissector_add("sctp.ppi",  ASAP_PAYLOAD_PROTOCOL_ID, asap_handle);
-  dissector_add("udp.port",  ASAP_UDP_PORT,  asap_handle);
-  dissector_add("tcp.port",  ASAP_TCP_PORT,  asap_handle);
-  dissector_add("sctp.port", ASAP_SCTP_PORT, asap_handle);
+  dissector_add_uint("sctp.ppi",  ASAP_PAYLOAD_PROTOCOL_ID, asap_handle);
+  dissector_add_uint("udp.port",  ASAP_UDP_PORT,  asap_handle);
+  dissector_add_uint("tcp.port",  ASAP_TCP_PORT,  asap_handle);
+  dissector_add_uint("sctp.port", ASAP_SCTP_PORT, asap_handle);
 }
diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 6f5a0e6cd1..b9d7e480ab 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -162,5 +162,5 @@ proto_reg_handoff_ascend(void)
   ppp_hdlc_handle = find_dissector("ppp_hdlc");
 
   ascend_handle = create_dissector_handle(dissect_ascend, proto_ascend);
-  dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, ascend_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_ASCEND, ascend_handle);
 }
diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c
index 09ce5130aa..7f57ffc228 100644
--- a/epan/dissectors/packet-asf.c
+++ b/epan/dissectors/packet-asf.c
@@ -378,5 +378,5 @@ proto_reg_handoff_asf(void)
 	data_handle = find_dissector("data");
 
 	asf_handle  = new_create_dissector_handle(dissect_asf, proto_asf);
-	dissector_add("rmcp.class", RMCP_CLASS_ASF, asf_handle);
+	dissector_add_uint("rmcp.class", RMCP_CLASS_ASF, asf_handle);
 }
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 3ff8c6b6f2..12797dc789 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -5724,8 +5724,8 @@ void proto_register_r3 (void)
 void proto_reg_handoff_r3 (void)
 {
   dissector_handle_t r3_handle = find_dissector ("r3");
-  dissector_add ("tcp.port", 2571, r3_handle);
-  dissector_add ("tcp.port", 8023, r3_handle);
+  dissector_add_uint ("tcp.port", 2571, r3_handle);
+  dissector_add_uint ("tcp.port", 8023, r3_handle);
 }
 
 
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 146c41a7dc..cc4dbd6c0b 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -1724,7 +1724,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode,
   }
   new_tvb = tvb_new_subset_remaining(tvb, DDP_SHORT_HEADER_SIZE);
 
-  if (!dissector_try_port(ddp_dissector_table, type, new_tvb, pinfo, tree))
+  if (!dissector_try_uint(ddp_dissector_table, type, new_tvb, pinfo, tree))
     call_dissector(data_handle,new_tvb, pinfo, tree);
 }
 
@@ -1800,7 +1800,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   new_tvb = tvb_new_subset_remaining(tvb, DDP_HEADER_SIZE);
 
-  if (!dissector_try_port(ddp_dissector_table, ddp.type, new_tvb, pinfo, tree))
+  if (!dissector_try_uint(ddp_dissector_table, ddp.type, new_tvb, pinfo, tree))
     call_dissector(data_handle,new_tvb, pinfo, tree);
 }
 
@@ -2451,33 +2451,33 @@ proto_reg_handoff_atalk(void)
   dissector_handle_t rtmp_data_handle, llap_handle;
 
   ddp_handle = create_dissector_handle(dissect_ddp, proto_ddp);
-  dissector_add("ethertype", ETHERTYPE_ATALK, ddp_handle);
-  dissector_add("chdlctype", ETHERTYPE_ATALK, ddp_handle);
-  dissector_add("ppp.protocol", PPP_AT, ddp_handle);
-  dissector_add("null.type", BSD_AF_APPLETALK, ddp_handle);
-  dissector_add("arcnet.protocol_id", ARCNET_PROTO_APPLETALK, ddp_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_ATALK, ddp_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_ATALK, ddp_handle);
+  dissector_add_uint("ppp.protocol", PPP_AT, ddp_handle);
+  dissector_add_uint("null.type", BSD_AF_APPLETALK, ddp_handle);
+  dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_APPLETALK, ddp_handle);
 
   nbp_handle = create_dissector_handle(dissect_nbp, proto_nbp);
-  dissector_add("ddp.type", DDP_NBP, nbp_handle);
+  dissector_add_uint("ddp.type", DDP_NBP, nbp_handle);
 
   atp_handle = create_dissector_handle(dissect_atp, proto_atp);
-  dissector_add("ddp.type", DDP_ATP, atp_handle);
+  dissector_add_uint("ddp.type", DDP_ATP, atp_handle);
 
   asp_handle = create_dissector_handle(dissect_asp, proto_asp);
   pap_handle = create_dissector_handle(dissect_pap, proto_pap);
 
   rtmp_request_handle = create_dissector_handle(dissect_rtmp_request, proto_rtmp);
   rtmp_data_handle = create_dissector_handle(dissect_rtmp_data, proto_rtmp);
-  dissector_add("ddp.type", DDP_RTMPREQ, rtmp_request_handle);
-  dissector_add("ddp.type", DDP_RTMPDATA, rtmp_data_handle);
+  dissector_add_uint("ddp.type", DDP_RTMPREQ, rtmp_request_handle);
+  dissector_add_uint("ddp.type", DDP_RTMPDATA, rtmp_data_handle);
 
   zip_ddp_handle = create_dissector_handle(dissect_ddp_zip, proto_zip);
-  dissector_add("ddp.type", DDP_ZIP, zip_ddp_handle);
+  dissector_add_uint("ddp.type", DDP_ZIP, zip_ddp_handle);
 
   zip_atp_handle = create_dissector_handle(dissect_atp_zip, proto_zip);
 
   llap_handle = create_dissector_handle(dissect_llap, proto_llap);
-  dissector_add("wtap_encap", WTAP_ENCAP_LOCALTALK, llap_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_LOCALTALK, llap_handle);
 
   register_init_routine( atp_init);
   register_init_routine( &asp_reinit);
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 2ec3c681af..67ca855a75 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -2021,10 +2021,10 @@ proto_reg_handoff_atm(void)
   fp_handle = find_dissector("fp");
 
   atm_handle = create_dissector_handle(dissect_atm, proto_atm);
-  dissector_add("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle);
 
   atm_untruncated_handle = create_dissector_handle(dissect_atm_untruncated,
                                                    proto_atm);
-  dissector_add("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED,
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED,
                 atm_untruncated_handle);
 }
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 604a44ae01..c0eeaef744 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -235,7 +235,7 @@ proto_reg_handoff_auto_rp(void)
 
 	auto_rp_handle = create_dissector_handle(dissect_auto_rp,
 	    proto_auto_rp);
-	dissector_add("udp.port", UDP_PORT_PIM_RP_DISC, auto_rp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_PIM_RP_DISC, auto_rp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c
index beccc4f892..06a0a390dc 100644
--- a/epan/dissectors/packet-ax4000.c
+++ b/epan/dissectors/packet-ax4000.c
@@ -167,7 +167,7 @@ proto_reg_handoff_ax4000(void)
 
 	ax4000_handle = create_dissector_handle(dissect_ax4000,
 	    proto_ax4000);
-	dissector_add("ip.proto", IP_PROTO_AX4000, ax4000_handle);
-	dissector_add("tcp.port", AX4000_TCP_PORT, ax4000_handle);
-	dissector_add("udp.port", AX4000_UDP_PORT, ax4000_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_AX4000, ax4000_handle);
+	dissector_add_uint("tcp.port", AX4000_TCP_PORT, ax4000_handle);
+	dissector_add_uint("udp.port", AX4000_UDP_PORT, ax4000_handle);
 }
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index 1f72a15cdf..506f0e4b5e 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -132,7 +132,7 @@ dissect_ayiya(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	switch (opcode) {
 	case OPCODE_FORWARD:
 		payload = tvb_new_subset_remaining(tvb, offset);
-		dissector_try_port(ip_dissector_table, next_header, payload, pinfo, tree);
+		dissector_try_uint(ip_dissector_table, next_header, payload, pinfo, tree);
 		break;
 	}
 }
@@ -209,7 +209,7 @@ proto_reg_handoff_ayiya(void)
 	dissector_handle_t ayiya_handle;
 
 	ayiya_handle = find_dissector("ayiya");
-	dissector_add("udp.port", UDP_PORT_AYIYA, ayiya_handle);
+	dissector_add_uint("udp.port", UDP_PORT_AYIYA, ayiya_handle);
 
 	ip_dissector_table = find_dissector_table("ip.proto");
 }
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 5f8fe6b60d..0787e04720 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -5983,7 +5983,7 @@ fConfirmedPrivateTransferRequest(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 	offset = fVendorIdentifier (tvb, pinfo, subtree, offset);
 
 	next_tvb = tvb_new_subset_remaining(tvb,offset);
-	if (dissector_try_port(bacapp_dissector_table,
+	if (dissector_try_uint(bacapp_dissector_table,
 	    vendor_identifier, next_tvb, pinfo, tree))
 	{
 		/* we parsed it so skip over length and we are done */
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 63fb759f92..174faa7b54 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -633,11 +633,11 @@ proto_reg_handoff_bacnet(void)
 	dissector_handle_t bacnet_handle;
 
 	bacnet_handle = find_dissector("bacnet");
-	dissector_add("bvlc.function", 0x04, bacnet_handle);
-	dissector_add("bvlc.function", 0x09, bacnet_handle);
-	dissector_add("bvlc.function", 0x0a, bacnet_handle);
-	dissector_add("bvlc.function", 0x0b, bacnet_handle);
-	dissector_add("llc.dsap", SAP_BACNET, bacnet_handle);
+	dissector_add_uint("bvlc.function", 0x04, bacnet_handle);
+	dissector_add_uint("bvlc.function", 0x09, bacnet_handle);
+	dissector_add_uint("bvlc.function", 0x0a, bacnet_handle);
+	dissector_add_uint("bvlc.function", 0x0b, bacnet_handle);
+	dissector_add_uint("llc.dsap", SAP_BACNET, bacnet_handle);
 	bacapp_handle = find_dissector("bacapp");
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index 4250b5dd1b..dc4cde4d07 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -259,12 +259,12 @@ dissect_banana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
 static void
 range_delete_banana_tcp_callback(guint32 port) {
-      dissector_delete("tcp.port", port, banana_handle);
+      dissector_delete_uint("tcp.port", port, banana_handle);
 }
 
 static void
 range_add_banana_tcp_callback(guint32 port) {
-    dissector_add("tcp.port", port, banana_handle);
+    dissector_add_uint("tcp.port", port, banana_handle);
 }
 
 static void
diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c
index fafd7d2fd3..f25635efb4 100644
--- a/epan/dissectors/packet-bat.c
+++ b/epan/dissectors/packet-bat.c
@@ -931,15 +931,15 @@ void proto_reg_handoff_bat(void)
 
 		inited = TRUE;
 	} else {
-		dissector_delete("udp.port", batman_udp_port, batman_handle);
-		dissector_delete("udp.port", gw_udp_port, gw_handle);
-		dissector_delete("udp.port", vis_udp_port, vis_handle);
+		dissector_delete_uint("udp.port", batman_udp_port, batman_handle);
+		dissector_delete_uint("udp.port", gw_udp_port, gw_handle);
+		dissector_delete_uint("udp.port", vis_udp_port, vis_handle);
 	}
 
 	batman_udp_port = global_bat_batman_udp_port;
 	gw_udp_port = global_bat_gw_udp_port;
 	vis_udp_port = global_bat_vis_udp_port;
-	dissector_add("udp.port", batman_udp_port, batman_handle);
-	dissector_add("udp.port", gw_udp_port, gw_handle);
-	dissector_add("udp.port", vis_udp_port, vis_handle);
+	dissector_add_uint("udp.port", batman_udp_port, batman_handle);
+	dissector_add_uint("udp.port", gw_udp_port, gw_handle);
+	dissector_add_uint("udp.port", vis_udp_port, vis_handle);
 }
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index 3961efc1d8..94036ea5d3 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -2074,9 +2074,9 @@ void proto_reg_handoff_batadv(void)
 
 		inited = TRUE;
 	} else {
-		dissector_delete("ethertype", old_batadv_ethertype, batman_handle);
+		dissector_delete_uint("ethertype", old_batadv_ethertype, batman_handle);
 	}
 
 	old_batadv_ethertype = batadv_ethertype;
-	dissector_add("ethertype", batadv_ethertype, batman_handle);
+	dissector_add_uint("ethertype", batadv_ethertype, batman_handle);
 }
diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c
index b93d55bed8..98cb5d033f 100644
--- a/epan/dissectors/packet-bctp.c
+++ b/epan/dissectors/packet-bctp.c
@@ -80,7 +80,7 @@ static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
 	proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE);
 	proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE);
 	
-	if ( dissector_try_port(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) {
+	if ( dissector_try_uint(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) {
 		return;
 	} else if (tpi <= 0x22) {
 		call_dissector(data_handle,sub_tvb, pinfo, tree);
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 6647b1c5f5..1675b53141 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -1095,7 +1095,7 @@ proto_reg_handoff_beep(void)
   }
   else {
 
-    dissector_delete("tcp.port", beep_tcp_port, beep_handle);
+    dissector_delete_uint("tcp.port", beep_tcp_port, beep_handle);
 
   }
 
@@ -1103,6 +1103,6 @@ proto_reg_handoff_beep(void)
 
   beep_tcp_port = global_beep_tcp_port;
 
-  dissector_add("tcp.port", global_beep_tcp_port, beep_handle);
+  dissector_add_uint("tcp.port", global_beep_tcp_port, beep_handle);
 
 }
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 5ff35dcdea..45d6e07963 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4840,7 +4840,7 @@ proto_reg_handoff_ber(void)
 	oid_add_from_string("basic-encoding","2.1.1");
 
 	ber_handle = create_dissector_handle(dissect_ber, proto_ber);
-	dissector_add("wtap_encap", WTAP_ENCAP_BER, ber_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_BER, ber_handle);
 
 	ber_decode_as_foreach(ber_add_syntax_name, &i);
 
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index 00efd295bc..9f5a7b3d8c 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -693,6 +693,6 @@ proto_reg_handoff_bfd(void)
     dissector_handle_t bfd_control_handle;
 
     bfd_control_handle = create_dissector_handle(dissect_bfd_control, proto_bfd);
-    dissector_add("udp.port", UDP_PORT_BFD_1HOP_CONTROL, bfd_control_handle);
-    dissector_add("udp.port", UDP_PORT_BFD_MULTIHOP_CONTROL, bfd_control_handle);
+    dissector_add_uint("udp.port", UDP_PORT_BFD_1HOP_CONTROL, bfd_control_handle);
+    dissector_add_uint("udp.port", UDP_PORT_BFD_MULTIHOP_CONTROL, bfd_control_handle);
 }
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 14511d5264..4bd47b8f3a 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -3168,5 +3168,5 @@ proto_reg_handoff_bgp(void)
     dissector_handle_t bgp_handle;
 
     bgp_handle = create_dissector_handle(dissect_bgp, proto_bgp);
-    dissector_add("tcp.port", BGP_TCP_PORT, bgp_handle);
+    dissector_add_uint("tcp.port", BGP_TCP_PORT, bgp_handle);
 }
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index feb08fd71a..77cfae9aa0 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -948,15 +948,15 @@ proto_reg_handoff_bittorrent(void)
 {
    dissector_handle = find_dissector("bittorrent.tcp");
 #if 0
-   dissector_add("tcp.port", 6881, dissector_handle);
-   dissector_add("tcp.port", 6882, dissector_handle);
-   dissector_add("tcp.port", 6883, dissector_handle);
-   dissector_add("tcp.port", 6884, dissector_handle);
-   dissector_add("tcp.port", 6885, dissector_handle);
-   dissector_add("tcp.port", 6886, dissector_handle);
-   dissector_add("tcp.port", 6887, dissector_handle);
-   dissector_add("tcp.port", 6888, dissector_handle);
-   dissector_add("tcp.port", 6889, dissector_handle);
+   dissector_add_uint("tcp.port", 6881, dissector_handle);
+   dissector_add_uint("tcp.port", 6882, dissector_handle);
+   dissector_add_uint("tcp.port", 6883, dissector_handle);
+   dissector_add_uint("tcp.port", 6884, dissector_handle);
+   dissector_add_uint("tcp.port", 6885, dissector_handle);
+   dissector_add_uint("tcp.port", 6886, dissector_handle);
+   dissector_add_uint("tcp.port", 6887, dissector_handle);
+   dissector_add_uint("tcp.port", 6888, dissector_handle);
+   dissector_add_uint("tcp.port", 6889, dissector_handle);
 #endif
    heur_dissector_add("tcp", test_bittorrent_packet, proto_bittorrent);
 }
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 23007aa293..46bfd6d824 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -178,10 +178,10 @@ void proto_reg_handoff_bjnp (void)
   dissector_handle_t bjnp_handle;
 
   bjnp_handle = find_dissector (PFNAME);
-  dissector_add ("udp.port", BJNP_PORT1, bjnp_handle);
-  dissector_add ("udp.port", BJNP_PORT2, bjnp_handle);
-  dissector_add ("udp.port", BJNP_PORT3, bjnp_handle);
-  dissector_add ("udp.port", BJNP_PORT4, bjnp_handle);
+  dissector_add_uint ("udp.port", BJNP_PORT1, bjnp_handle);
+  dissector_add_uint ("udp.port", BJNP_PORT2, bjnp_handle);
+  dissector_add_uint ("udp.port", BJNP_PORT3, bjnp_handle);
+  dissector_add_uint ("udp.port", BJNP_PORT4, bjnp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c
index 8e392aee81..c1f29916b6 100644
--- a/epan/dissectors/packet-bofl.c
+++ b/epan/dissectors/packet-bofl.c
@@ -134,5 +134,5 @@ proto_reg_handoff_bofl(void)
     dissector_handle_t bofl_handle;
 
     bofl_handle = create_dissector_handle(dissect_bofl, proto_bofl);
-    dissector_add("ethertype", ETHER_TYPE_BOFL, bofl_handle);
+    dissector_add_uint("ethertype", ETHER_TYPE_BOFL, bofl_handle);
 }
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 6ec65c1d50..c3bca4935a 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -5001,6 +5001,6 @@ proto_reg_handoff_bootp(void)
 	dissector_handle_t bootp_handle;
 
 	bootp_handle = create_dissector_handle(dissect_bootp, proto_bootp);
-	dissector_add("udp.port", UDP_PORT_BOOTPS, bootp_handle);
-	dissector_add("udp.port", UDP_PORT_BOOTPC, bootp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_BOOTPS, bootp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_BOOTPC, bootp_handle);
 }
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 8e9cd94791..f3c6deffd1 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -1184,8 +1184,8 @@ proto_reg_handoff_bpdu(void)
   data_handle = find_dissector("data");
 
   bpdu_handle = find_dissector("bpdu");
-  dissector_add("llc.dsap", SAP_BPDU, bpdu_handle);
-  dissector_add("chdlctype", CHDLCTYPE_BPDU, bpdu_handle);
-  dissector_add("llc.cisco_pid", 0x010b, bpdu_handle);
-  dissector_add("ethertype", ETHERTYPE_STP, bpdu_handle);
+  dissector_add_uint("llc.dsap", SAP_BPDU, bpdu_handle);
+  dissector_add_uint("chdlctype", CHDLCTYPE_BPDU, bpdu_handle);
+  dissector_add_uint("llc.cisco_pid", 0x010b, bpdu_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_STP, bpdu_handle);
 }
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 588f14a893..6725a85129 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -474,8 +474,8 @@ proto_reg_handoff_brdwlk(void)
     dissector_handle_t brdwlk_handle;
 
     brdwlk_handle = create_dissector_handle (dissect_brdwlk, proto_brdwlk);
-    dissector_add("ethertype", ETHERTYPE_BRDWALK, brdwlk_handle);
-    dissector_add("ethertype", 0xABCD, brdwlk_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_BRDWALK, brdwlk_handle);
+    dissector_add_uint("ethertype", 0xABCD, brdwlk_handle);
     data_handle = find_dissector("data");
     fc_dissector_handle = find_dissector ("fc");
 }
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index e65167acb3..96698a02cf 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -425,13 +425,13 @@ dissect_bssap_data_param(tvbuff_t *tvb, packet_info *pinfo,
             }
             else
             {
-                if (dissector_try_port(bssap_dissector_table, pdu_type, tvb, pinfo, tree)) return;
+                if (dissector_try_uint(bssap_dissector_table, pdu_type, tvb, pinfo, tree)) return;
             }
         }
         else
         {
             /* BSAP */
-            if (dissector_try_port(bsap_dissector_table, pdu_type, tvb, pinfo, tree))
+            if (dissector_try_uint(bsap_dissector_table, pdu_type, tvb, pinfo, tree))
                 return;
         }
     }
@@ -2563,9 +2563,9 @@ proto_reg_handoff_bssap(void)
         rrlp_handle = find_dissector("rrlp");
         initialized = TRUE;
     } else {
-        dissector_delete("sccp.ssn", old_bssap_ssn, bssap_plus_handle); 
+        dissector_delete_uint("sccp.ssn", old_bssap_ssn, bssap_plus_handle); 
     }
 
-    dissector_add("sccp.ssn", global_bssap_ssn, bssap_plus_handle);
+    dissector_add_uint("sccp.ssn", global_bssap_ssn, bssap_plus_handle);
     old_bssap_ssn = global_bssap_ssn;
 }
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c
index 3dbeeca7bd..89ea33e261 100644
--- a/epan/dissectors/packet-btamp.c
+++ b/epan/dissectors/packet-btamp.c
@@ -636,6 +636,6 @@ proto_reg_handoff_btamp(void)
     dissector_handle_t btamp_handle;
 
     btamp_handle = find_dissector("btamp");
-    dissector_add("btl2cap.cid", BTL2CAP_FIXED_CID_AMP_MAN, btamp_handle);
+    dissector_add_uint("btl2cap.cid", BTL2CAP_FIXED_CID_AMP_MAN, btamp_handle);
 }
 
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 983d7ce4e0..03391c5659 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -297,8 +297,8 @@ proto_reg_handoff_btacl(void)
 	dissector_handle_t bthci_acl_handle;
 
 	bthci_acl_handle = find_dissector("bthci_acl");
-	dissector_add("hci_h4.type", HCI_H4_TYPE_ACL, bthci_acl_handle);
-	dissector_add("hci_h1.type", BTHCI_CHANNEL_ACL, bthci_acl_handle);
+	dissector_add_uint("hci_h4.type", HCI_H4_TYPE_ACL, bthci_acl_handle);
+	dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_ACL, bthci_acl_handle);
 
 
 	btl2cap_handle = find_dissector("btl2cap");
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 86b2de339d..68e0a4cca1 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -2924,7 +2924,7 @@ proto_reg_handoff_bthci_cmd(void)
 {
 	dissector_handle_t bthci_cmd_handle;
 	bthci_cmd_handle = find_dissector("bthci_cmd");
-	dissector_add("hci_h4.type", HCI_H4_TYPE_CMD, bthci_cmd_handle);
-	dissector_add("hci_h1.type", BTHCI_CHANNEL_COMMAND, bthci_cmd_handle);
+	dissector_add_uint("hci_h4.type", HCI_H4_TYPE_CMD, bthci_cmd_handle);
+	dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_COMMAND, bthci_cmd_handle);
 }
 
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index e1caa641a9..32c9128014 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -3543,8 +3543,8 @@ proto_reg_handoff_bthci_evt(void)
 	dissector_handle_t bthci_evt_handle;
 
 	bthci_evt_handle = find_dissector("bthci_evt");
-	dissector_add("hci_h4.type", HCI_H4_TYPE_EVT, bthci_evt_handle);
-	dissector_add("hci_h1.type", BTHCI_CHANNEL_EVENT, bthci_evt_handle);
+	dissector_add_uint("hci_h4.type", HCI_H4_TYPE_EVT, bthci_evt_handle);
+	dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_EVENT, bthci_evt_handle);
 
 	bthci_com_handle = find_dissector("bthci_cmd");
 }
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index b1b41eff20..a6f5552bd5 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -109,8 +109,8 @@ proto_reg_handoff_btsco(void)
 	dissector_handle_t bthci_sco_handle;
 
 	bthci_sco_handle = find_dissector("bthci_sco");
-	dissector_add("hci_h4.type", HCI_H4_TYPE_SCO, bthci_sco_handle);
-	dissector_add("hci_h1.type", BTHCI_CHANNEL_SCO, bthci_sco_handle);
+	dissector_add_uint("hci_h4.type", HCI_H4_TYPE_SCO, bthci_sco_handle);
+	dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_SCO, bthci_sco_handle);
 }
 
 
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 67e03c5278..ce725997ff 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -808,7 +808,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
 		PROTO_ITEM_SET_GENERATED(psm_item);
 
 		/* call next dissector */
-		if (!dissector_try_port(l2cap_psm_dissector_table, (guint32) psm,
+		if (!dissector_try_uint(l2cap_psm_dissector_table, (guint32) psm,
 					next_tvb, pinfo, tree)) {
 			/* unknown protocol. declare as data */
 			proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
@@ -942,7 +942,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
 			PROTO_ITEM_SET_GENERATED(psm_item);
 
 			/* call next dissector */
-			if (!dissector_try_port(l2cap_psm_dissector_table, (guint32) psm,
+			if (!dissector_try_uint(l2cap_psm_dissector_table, (guint32) psm,
 						next_tvb, pinfo, tree)) {
 				/* unknown protocol. declare as data */
 				proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_length(next_tvb), TRUE);
@@ -1181,7 +1181,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), length);
 
 		/* call next dissector */
-		if(!dissector_try_port(l2cap_psm_dissector_table, (guint32) psm,
+		if(!dissector_try_uint(l2cap_psm_dissector_table, (guint32) psm,
 					next_tvb, pinfo, tree)){
 			/* unknown protocol. declare as data */
 			proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
@@ -1219,7 +1219,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), length);
 		}
 		/* call next dissector */
-		if(next_tvb && !dissector_try_port(l2cap_cid_dissector_table, (guint32) cid,
+		if(next_tvb && !dissector_try_uint(l2cap_cid_dissector_table, (guint32) cid,
 					next_tvb, pinfo, tree)){
 			/* unknown protocol. declare as data */
 			proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, TRUE);
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 06d0cdaab2..0134abb144 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -750,6 +750,6 @@ proto_reg_handoff_btrfcomm(void)
 	btobex_handle = find_dissector("btobex");
 
     btrfcomm_handle = find_dissector("btrfcomm");
-	dissector_add("btl2cap.psm", BTL2CAP_PSM_RFCOMM, btrfcomm_handle);
+	dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_RFCOMM, btrfcomm_handle);
 }
 
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 8b6cc79bb1..59454a548b 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -822,5 +822,5 @@ proto_reg_handoff_btsdp(void)
 	dissector_handle_t btsdp_handle;
 
 	btsdp_handle = find_dissector("btsdp");
-	dissector_add("btl2cap.psm", BTL2CAP_PSM_SDP, btsdp_handle);
+	dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_SDP, btsdp_handle);
 }
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 0c28592921..da674c0d7e 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -304,7 +304,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	npdu_length = packet_length - bvlc_length;
 	next_tvb = tvb_new_subset(tvb,bvlc_length,-1,npdu_length);
 	/* Code from Guy Harris */
-	if (!dissector_try_port(bvlc_dissector_table,
+	if (!dissector_try_uint(bvlc_dissector_table,
 	    bvlc_function, next_tvb, pinfo, tree)) {
 		/* Unknown function - dissect the paylod as data */
 		call_dissector(data_handle,next_tvb, pinfo, tree);
@@ -428,19 +428,19 @@ proto_reg_handoff_bvlc(void)
 	if (!bvlc_initialized)
 	{
 		bvlc_handle = find_dissector("bvlc");
-		dissector_add("udp.port", 0xBAC0, bvlc_handle);
+		dissector_add_uint("udp.port", 0xBAC0, bvlc_handle);
 		data_handle = find_dissector("data");
 		bvlc_initialized = TRUE;
 	}
 	else
 	{
 		if (additional_bvlc_udp_port != 0) {
-			dissector_delete("udp.port", additional_bvlc_udp_port, bvlc_handle);
+			dissector_delete_uint("udp.port", additional_bvlc_udp_port, bvlc_handle);
 		}
 	}
 
 	if (global_additional_bvlc_udp_port != 0) {
-		dissector_add("udp.port", global_additional_bvlc_udp_port, bvlc_handle);
+		dissector_add_uint("udp.port", global_additional_bvlc_udp_port, bvlc_handle);
 	}
 	additional_bvlc_udp_port = global_additional_bvlc_udp_port;
 }
diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c
index d12213bddb..7ab6472f8a 100644
--- a/epan/dissectors/packet-calcappprotocol.c
+++ b/epan/dissectors/packet-calcappprotocol.c
@@ -168,5 +168,5 @@ proto_reg_handoff_calcappprotocol(void)
   dissector_handle_t calcappprotocol_handle;
 
   calcappprotocol_handle = new_create_dissector_handle(dissect_calcappprotocol, proto_calcappprotocol);
-  dissector_add("sctp.ppi", CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID, calcappprotocol_handle);
+  dissector_add_uint("sctp.ppi", CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID, calcappprotocol_handle);
 }
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index c5fbe4ccc0..7f47c0f515 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -2209,11 +2209,11 @@ proto_reg_handoff_capwap(void)
 
 		inited = TRUE;
 	} else {
-		dissector_delete("udp.port", capwap_control_udp_port, capwap_control_handle);
-		dissector_delete("udp.port", capwap_data_udp_port, capwap_data_handle);
+		dissector_delete_uint("udp.port", capwap_control_udp_port, capwap_control_handle);
+		dissector_delete_uint("udp.port", capwap_data_udp_port, capwap_data_handle);
 	}
-	dissector_add("udp.port", global_capwap_control_udp_port, capwap_control_handle);
-	dissector_add("udp.port", global_capwap_data_udp_port, capwap_data_handle);
+	dissector_add_uint("udp.port", global_capwap_control_udp_port, capwap_control_handle);
+	dissector_add_uint("udp.port", global_capwap_data_udp_port, capwap_data_handle);
 
 	capwap_control_udp_port = global_capwap_control_udp_port;
 	capwap_data_udp_port    = global_capwap_data_udp_port;
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index 299b6768d7..df2cbf5f0d 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -1766,6 +1766,6 @@ proto_reg_handoff_cast(void)
 
   data_handle = find_dissector("data");
   cast_handle = create_dissector_handle(dissect_cast, proto_cast);
-  dissector_add("tcp.port", TCP_PORT_CAST, cast_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_CAST, cast_handle);
 }
 
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index f680df2986..4e290e8b16 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -2350,7 +2350,7 @@ void proto_reg_handoff_catapult_dct2000(void)
 {
     dissector_handle_t catapult_dct2000_handle = find_dissector("dct2000");
 
-    dissector_add("wtap_encap", WTAP_ENCAP_CATAPULT_DCT2000, catapult_dct2000_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_CATAPULT_DCT2000, catapult_dct2000_handle);
 
     mac_lte_handle = find_dissector("mac-lte");
     rlc_lte_handle = find_dissector("rlc-lte");
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index dd0dc2b6e7..407b52c267 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -1249,7 +1249,7 @@ proto_reg_handoff_cdp(void)
 
     data_handle = find_dissector("data");
     cdp_handle = create_dissector_handle(dissect_cdp, proto_cdp);
-    dissector_add("llc.cisco_pid", 0x2000, cdp_handle);
-    dissector_add("chdlctype", 0x2000, cdp_handle);
-    dissector_add("ppp.protocol", 0x0207, cdp_handle);
+    dissector_add_uint("llc.cisco_pid", 0x2000, cdp_handle);
+    dissector_add_uint("chdlctype", 0x2000, cdp_handle);
+    dissector_add_uint("ppp.protocol", 0x0207, cdp_handle);
 }
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index def1082f62..27cf11a576 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -1915,6 +1915,6 @@ void proto_reg_handoff_cfm(void)
 {
 	dissector_handle_t cfm_handle;
 	cfm_handle = create_dissector_handle(dissect_cfm, proto_cfm);
-	dissector_add("ethertype", ETHERTYPE_CFM, cfm_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_CFM, cfm_handle);
 }
 
diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index 85dfdc1880..4411aefb47 100644
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
@@ -135,6 +135,6 @@ proto_reg_handoff_cgmp(void)
 	dissector_handle_t cgmp_handle;
 
 	cgmp_handle = create_dissector_handle(dissect_cgmp, proto_cgmp);
-	dissector_add("llc.cisco_pid", 0x2001, cgmp_handle);
-	dissector_add("ethertype", 0x2001, cgmp_handle);
+	dissector_add_uint("llc.cisco_pid", 0x2001, cgmp_handle);
+	dissector_add_uint("ethertype", 0x2001, cgmp_handle);
 }
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 1f3e31e1d9..61d8a8856a 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -146,7 +146,7 @@ chdlctype(guint16 chdlc_type, tvbuff_t *tvb, int offset_after_chdlctype,
   }
 
   /* do lookup with the subdissector table */
-  if (!dissector_try_port(subdissector_table, chdlc_type, next_tvb, pinfo, tree)) {
+  if (!dissector_try_uint(subdissector_table, chdlc_type, next_tvb, pinfo, tree)) {
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
       col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", chdlc_type);
     call_dissector(data_handle,next_tvb, pinfo, tree);
@@ -245,8 +245,8 @@ proto_reg_handoff_chdlc(void)
 
   data_handle = find_dissector("data");
   chdlc_handle = find_dissector("chdlc");
-  dissector_add("wtap_encap", WTAP_ENCAP_CHDLC, chdlc_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_CHDLC_WITH_PHDR, chdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_CHDLC, chdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_CHDLC_WITH_PHDR, chdlc_handle);
 }
 
 #define SLARP_REQUEST	0
@@ -363,5 +363,5 @@ proto_reg_handoff_slarp(void)
   dissector_handle_t slarp_handle;
 
   slarp_handle = create_dissector_handle(dissect_slarp, proto_slarp);
-  dissector_add("chdlctype", CISCO_SLARP, slarp_handle);
+  dissector_add_uint("chdlctype", CISCO_SLARP, slarp_handle);
 }
diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c
index 13bc264f30..17c53ee685 100644
--- a/epan/dissectors/packet-cimetrics.c
+++ b/epan/dissectors/packet-cimetrics.c
@@ -130,7 +130,7 @@ proto_reg_handoff_cimetrics(void)
 	dissector_handle_t mstp_handle;
 
 	mstp_handle = find_dissector("cimetrics");
-	dissector_add("llc.cimetrics_pid", 1, mstp_handle);
+	dissector_add_uint("llc.cimetrics_pid", 1, mstp_handle);
 	bacnet_handle = find_dissector("bacnet");
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 827dc842b3..cbf19127b7 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -2691,7 +2691,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info
                      classid = tvb_get_letohl( tvb, offset + 4 );
                   break;
                }
-               dissector = dissector_get_port_handle( subdissector_class_table, classid );
+               dissector = dissector_get_uint_handle( subdissector_class_table, classid );
                if ( preq_info )
                   preq_info->dissector = dissector;
                break;
@@ -2699,7 +2699,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info
             break;
 
          case CI_DATA_SEGMENT:
-            dissector = dissector_get_port_handle( subdissector_symbol_table, segment );
+            dissector = dissector_get_uint_handle( subdissector_symbol_table, segment );
             if ( preq_info )
                preq_info->dissector = dissector;
             break;
@@ -3042,23 +3042,23 @@ proto_reg_handoff_cip(void)
    /* Register for UCMM CIP data, using EtherNet/IP SendRRData service*/
    /* Register for Connected CIP data, using EtherNet/IP SendUnitData service*/
    cip_handle = new_create_dissector_handle( dissect_cip, proto_cip );
-   dissector_add( "enip.srrd.iface", ENIP_CIP_INTERFACE, cip_handle );
-   dissector_add( "enip.sud.iface", ENIP_CIP_INTERFACE, cip_handle );
+   dissector_add_uint( "enip.srrd.iface", ENIP_CIP_INTERFACE, cip_handle );
+   dissector_add_uint( "enip.sud.iface", ENIP_CIP_INTERFACE, cip_handle );
 
    /* Create and register dissector handle for generic class */
    cip_class_generic_handle = new_create_dissector_handle( dissect_cip_class_generic, proto_cip_class_generic );
-   dissector_add( "cip.class.iface", 0, cip_class_generic_handle );
+   dissector_add_uint( "cip.class.iface", 0, cip_class_generic_handle );
 
    /* Create and register dissector handle for Message Router */
    cip_class_mr_handle = new_create_dissector_handle( dissect_cip_class_mr, proto_cip_class_mr );
-   dissector_add( "cip.class.iface", CI_CLS_MR, cip_class_mr_handle );
+   dissector_add_uint( "cip.class.iface", CI_CLS_MR, cip_class_mr_handle );
 
    /* Create and register dissector handle for Connection Manager */
    cip_class_cm_handle = new_create_dissector_handle( dissect_cip_class_cm, proto_cip_class_cm );
-   dissector_add( "cip.class.iface", CI_CLS_CM, cip_class_cm_handle );
+   dissector_add_uint( "cip.class.iface", CI_CLS_CM, cip_class_cm_handle );
 
    /* Create and register dissector handle for Connection Configuration Object */
    cip_class_cco_handle = new_create_dissector_handle( dissect_cip_class_cco, proto_cip_class_cco );
-   dissector_add( "cip.class.iface", CI_CLS_CCO, cip_class_cco_handle );
+   dissector_add_uint( "cip.class.iface", CI_CLS_CCO, cip_class_cco_handle );
 
 } /* end of proto_reg_handoff_cip() */
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c
index a71c1cc0fc..66ef911e39 100644
--- a/epan/dissectors/packet-cisco-erspan.c
+++ b/epan/dissectors/packet-cisco-erspan.c
@@ -275,8 +275,8 @@ proto_reg_handoff_erspan(void)
         ethnofcs_handle = find_dissector("eth_withoutfcs");
 
 	erspan_handle = create_dissector_handle(dissect_erspan, proto_erspan);
-        dissector_add("gre.proto", GRE_ERSPAN_88BE, erspan_handle);
-        dissector_add("gre.proto", GRE_ERSPAN_22EB, erspan_handle);
+        dissector_add_uint("gre.proto", GRE_ERSPAN_88BE, erspan_handle);
+        dissector_add_uint("gre.proto", GRE_ERSPAN_22EB, erspan_handle);
 
 }
 
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index 9d448fe9a6..a1d07150dd 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -210,11 +210,11 @@ proto_reg_handoff_cwids(void)
 		initialized = TRUE;
 	} else {
 		if (saved_udp_port != 0) {
-			dissector_delete("udp.port", saved_udp_port, cwids_handle);
+			dissector_delete_uint("udp.port", saved_udp_port, cwids_handle);
 		}
 	}
 	if (global_udp_port != 0) {
-		dissector_add("udp.port", global_udp_port, cwids_handle);
+		dissector_add_uint("udp.port", global_udp_port, cwids_handle);
 	}
 	saved_udp_port = global_udp_port;
 }
diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index 6997c28de3..140b557423 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -711,8 +711,8 @@ proto_reg_handoff_classicstun(void)
 
 	classicstun_handle = find_dissector("classicstun");
 
-	dissector_add("tcp.port", TCP_PORT_STUN, classicstun_handle);
-	dissector_add("udp.port", UDP_PORT_STUN, classicstun_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_STUN, classicstun_handle);
+	dissector_add_uint("udp.port", UDP_PORT_STUN, classicstun_handle);
 #endif
 	heur_dissector_add("udp", dissect_classicstun_heur, proto_classicstun);
 	heur_dissector_add("tcp", dissect_classicstun_heur, proto_classicstun);
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index 36643406dd..f985d0d271 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -112,5 +112,5 @@ proto_reg_handoff_clip(void)
 
   clip_handle = create_dissector_handle(dissect_clip, -1);
       /* XXX - no protocol, can't be disabled */
-  dissector_add("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle);
 }
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index bd9db552d1..d1afab658f 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -667,7 +667,7 @@ proto_reg_handoff_clnp(void)
   data_handle = find_dissector("data");
 
   clnp_handle = create_dissector_handle(dissect_clnp, proto_clnp);
-  dissector_add("osinl", NLPID_ISO8473_CLNP, clnp_handle);
-  dissector_add("osinl", NLPID_NULL, clnp_handle); /* Inactive subset */
-  dissector_add("x.25.spi", NLPID_ISO8473_CLNP, clnp_handle);
+  dissector_add_uint("osinl", NLPID_ISO8473_CLNP, clnp_handle);
+  dissector_add_uint("osinl", NLPID_NULL, clnp_handle); /* Inactive subset */
+  dissector_add_uint("x.25.spi", NLPID_ISO8473_CLNP, clnp_handle);
 }
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 68d0e780f4..c9a2233b04 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -2467,7 +2467,7 @@ void proto_reg_handoff_cmp(void) {
 		dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
 
 		cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
-		dissector_add("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
+		dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
 
 		oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
 		oid_add_from_string("Cryptlib-PKIBoot","1.3.6.1.4.1.3029.3.1.2");
@@ -2508,17 +2508,17 @@ void proto_reg_handoff_cmp(void) {
 	/* change alternate TCP port if changed in the preferences */
 	if (cmp_alternate_tcp_port != cmp_alternate_tcp_port_prev) {
 		if (cmp_alternate_tcp_port_prev != 0)
-			dissector_delete("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
+			dissector_delete_uint("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
 		if (cmp_alternate_tcp_port != 0)
-			dissector_add("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
+			dissector_add_uint("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
 		cmp_alternate_tcp_port_prev = cmp_alternate_tcp_port;
 	}
 
 	/* change alternate HTTP port if changed in the preferences */
 	if (cmp_alternate_http_port != cmp_alternate_http_port_prev) {
 		if (cmp_alternate_http_port_prev != 0) {
-			dissector_delete("tcp.port", cmp_alternate_http_port_prev, NULL);
-			dissector_delete("http.port", cmp_alternate_http_port_prev, NULL);
+			dissector_delete_uint("tcp.port", cmp_alternate_http_port_prev, NULL);
+			dissector_delete_uint("http.port", cmp_alternate_http_port_prev, NULL);
 		}
 		if (cmp_alternate_http_port != 0)
 			http_dissector_add( cmp_alternate_http_port, cmp_http_handle);
@@ -2528,8 +2528,8 @@ void proto_reg_handoff_cmp(void) {
 	/* change alternate TCP-style-HTTP port if changed in the preferences */
 	if (cmp_alternate_tcp_style_http_port != cmp_alternate_tcp_style_http_port_prev) {
 		if (cmp_alternate_tcp_style_http_port_prev != 0) {
-			dissector_delete("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
-			dissector_delete("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+			dissector_delete_uint("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+			dissector_delete_uint("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
 		}
 		if (cmp_alternate_tcp_style_http_port != 0)
 			http_dissector_add( cmp_alternate_tcp_style_http_port, cmp_tcp_style_http_handle);
diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c
index f0b8fd570d..5a2a8c11d0 100644
--- a/epan/dissectors/packet-cmpp.c
+++ b/epan/dissectors/packet-cmpp.c
@@ -981,8 +981,8 @@ proto_reg_handoff_cmpp(void)
 	dissector_handle_t cmpp_handle;
 
 	cmpp_handle = new_create_dissector_handle(dissect_cmpp, proto_cmpp);
-	dissector_add("tcp.port", CMPP_SP_LONG_PORT, cmpp_handle);
-	dissector_add("tcp.port", CMPP_SP_SHORT_PORT, cmpp_handle);
-	dissector_add("tcp.port", CMPP_ISMG_LONG_PORT, cmpp_handle);
-	dissector_add("tcp.port", CMPP_ISMG_SHORT_PORT, cmpp_handle);
+	dissector_add_uint("tcp.port", CMPP_SP_LONG_PORT, cmpp_handle);
+	dissector_add_uint("tcp.port", CMPP_SP_SHORT_PORT, cmpp_handle);
+	dissector_add_uint("tcp.port", CMPP_ISMG_LONG_PORT, cmpp_handle);
+	dissector_add_uint("tcp.port", CMPP_ISMG_SHORT_PORT, cmpp_handle);
 }
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c
index fbf497a155..6a250efbfb 100644
--- a/epan/dissectors/packet-coap.c
+++ b/epan/dissectors/packet-coap.c
@@ -508,11 +508,11 @@ proto_reg_handoff_coap(void)
 		media_type_dissector_table = find_dissector_table("media_type");
 		coap_prefs_initialized = TRUE;
 	} else {
-		dissector_delete("udp.port", coap_port_number, coap_handle);
-		dissector_delete("tcp.port", coap_port_number, coap_handle);
+		dissector_delete_uint("udp.port", coap_port_number, coap_handle);
+		dissector_delete_uint("tcp.port", coap_port_number, coap_handle);
 	}
 
 	coap_port_number = global_coap_port_number;
-	dissector_add("udp.port", coap_port_number, coap_handle);
-	dissector_add("tcp.port", coap_port_number, coap_handle);
+	dissector_add_uint("udp.port", coap_port_number, coap_handle);
+	dissector_add_uint("tcp.port", coap_port_number, coap_handle);
 }
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index a20eb2d6d5..7f6b64d700 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -1457,10 +1457,10 @@ void proto_reg_handoff_collectd (void)
 	/* Change the dissector registration if the preferences have been
 	 * changed. */
 	if (registered_udp_port != -1)
-		dissector_delete ("udp.port", registered_udp_port,
+		dissector_delete_uint ("udp.port", registered_udp_port,
 				  collectd_handle);
 
-	dissector_add ("udp.port", collectd_udp_port, collectd_handle);
+	dissector_add_uint ("udp.port", collectd_udp_port, collectd_handle);
 	registered_udp_port = collectd_udp_port;
 
 	if (first_run)
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c
index 1130834898..e396e94807 100644
--- a/epan/dissectors/packet-componentstatus.c
+++ b/epan/dissectors/packet-componentstatus.c
@@ -289,5 +289,5 @@ proto_reg_handoff_componentstatusprotocol(void)
   dissector_handle_t componentstatusprotocol_handle;
 
   componentstatusprotocol_handle = new_create_dissector_handle(dissect_componentstatusprotocol, proto_componentstatusprotocol);
-  dissector_add("udp.port", COMPONENTSTATUSPROTOCOL_PORT, componentstatusprotocol_handle);
+  dissector_add_uint("udp.port", COMPONENTSTATUSPROTOCOL_PORT, componentstatusprotocol_handle);
 }
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index ab772363c6..0912d5696a 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -2540,15 +2540,15 @@ void proto_reg_handoff_cops(void)
 
   if (!cops_prefs_initialized) {
     cops_handle = find_dissector("cops");
-    dissector_add("tcp.port", TCP_PORT_PKTCABLE_COPS, cops_handle);
-    dissector_add("tcp.port", TCP_PORT_PKTCABLE_MM_COPS, cops_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_PKTCABLE_COPS, cops_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_PKTCABLE_MM_COPS, cops_handle);
     cops_prefs_initialized = TRUE;
   } else {
-    dissector_delete("tcp.port",cops_tcp_port,cops_handle);
+    dissector_delete_uint("tcp.port",cops_tcp_port,cops_handle);
   }
   cops_tcp_port = global_cops_tcp_port;
 
-  dissector_add("tcp.port", cops_tcp_port, cops_handle);
+  dissector_add_uint("tcp.port", cops_tcp_port, cops_handle);
 }
 
 
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 84ed2c0dec..111aa5cdd8 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -184,5 +184,5 @@ proto_reg_handoff_cosine(void)
   data_handle = find_dissector("data");
 
   cosine_handle = create_dissector_handle(dissect_cosine, proto_cosine);
-  dissector_add("wtap_encap", WTAP_ENCAP_COSINE, cosine_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_COSINE, cosine_handle);
 }
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 776c0c79dc..e7efc5ce94 100644
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -547,13 +547,13 @@ proto_reg_handoff_cpfi(void)
   }
   else
   {
-    dissector_delete("udp.port", cpfi_udp_port, cpfi_handle);
-    dissector_delete("udp.port", cpfi_ttot_udp_port, ttot_handle);
+    dissector_delete_uint("udp.port", cpfi_udp_port, cpfi_handle);
+    dissector_delete_uint("udp.port", cpfi_ttot_udp_port, ttot_handle);
   }
 
   cpfi_udp_port      = gbl_cpfi_udp_port;
   cpfi_ttot_udp_port = gbl_cpfi_ttot_udp_port;
 
-  dissector_add("udp.port", cpfi_udp_port, cpfi_handle);
-  dissector_add("udp.port", cpfi_ttot_udp_port, ttot_handle);
+  dissector_add_uint("udp.port", cpfi_udp_port, cpfi_handle);
+  dissector_add_uint("udp.port", cpfi_ttot_udp_port, ttot_handle);
 }
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 2ab874b319..474d84dd94 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -549,5 +549,5 @@ proto_reg_handoff_cpha(void)
   dissector_handle_t cpha_handle;
 
   cpha_handle = new_create_dissector_handle(dissect_cpha, proto_cphap);
-  dissector_add("udp.port", UDP_PORT_CPHA, cpha_handle);
+  dissector_add_uint("udp.port", UDP_PORT_CPHA, cpha_handle);
 }
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 6e2845a3a5..2d2c0d5904 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -658,5 +658,5 @@ proto_reg_handoff_csm_encaps(void)
 	dissector_handle_t csm_encaps_handle;
 
 	csm_encaps_handle = create_dissector_handle(dissect_csm_encaps, proto_csm_encaps);
-	dissector_add("ethertype", ETHERTYPE_CSM_ENCAPS, csm_encaps_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_CSM_ENCAPS, csm_encaps_handle);
 }
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index a1c13133d5..5a406ea61b 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -384,5 +384,5 @@ proto_reg_handoff_cups(void)
 	dissector_handle_t cups_handle;
 
 	cups_handle = create_dissector_handle(dissect_cups, proto_cups);
-	dissector_add("udp.port", UDP_PORT_CUPS, cups_handle);
+	dissector_add_uint("udp.port", UDP_PORT_CUPS, cups_handle);
 }
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 01c11accbd..c040e91bc3 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -6721,12 +6721,12 @@ prefs_register_dap(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dap_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dap_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dap_tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c
index a5a1fad917..31c2960039 100644
--- a/epan/dissectors/packet-daytime.c
+++ b/epan/dissectors/packet-daytime.c
@@ -49,7 +49,7 @@ dissect_daytime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   if (check_col(pinfo->cinfo, COL_INFO)) {
     col_add_fstr(pinfo->cinfo, COL_INFO, "DAYTIME %s",
-		 pinfo->srcport == pinfo->match_port ? "Response":"Request");
+		 pinfo->srcport == pinfo->match_uint ? "Response":"Request");
   }
 
   if (tree) {
@@ -90,6 +90,6 @@ proto_reg_handoff_daytime(void)
   dissector_handle_t daytime_handle;
 
   daytime_handle = create_dissector_handle(dissect_daytime, proto_daytime);
-  dissector_add("udp.port", DAYTIME_PORT, daytime_handle);
-  dissector_add("tcp.port", DAYTIME_PORT, daytime_handle);
+  dissector_add_uint("udp.port", DAYTIME_PORT, daytime_handle);
+  dissector_add_uint("tcp.port", DAYTIME_PORT, daytime_handle);
 }
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index 5c15a6f912..9280f8a671 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -249,8 +249,8 @@ proto_reg_handoff_db_lsp (void)
   db_lsp_tcp_handle = find_dissector ("db-lsp.tcp");
   db_lsp_udp_handle = find_dissector ("db-lsp.udp");
 
-  dissector_add ("tcp.port", DB_LSP_PORT, db_lsp_tcp_handle);
-  dissector_add ("udp.port", DB_LSP_PORT, db_lsp_udp_handle);
+  dissector_add_uint ("tcp.port", DB_LSP_PORT, db_lsp_tcp_handle);
+  dissector_add_uint ("udp.port", DB_LSP_PORT, db_lsp_udp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index e3560c71d4..15ce87809b 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -248,11 +248,11 @@ decode_dccp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 		high_port = dport;
 	}
 	if (low_port != 0 &&
-	    dissector_try_port(dccp_subdissector_table, low_port, next_tvb, pinfo, tree)) {
+	    dissector_try_uint(dccp_subdissector_table, low_port, next_tvb, pinfo, tree)) {
 		return;
 	}
 	if (high_port != 0 &&
-	    dissector_try_port(dccp_subdissector_table, high_port, next_tvb, pinfo, tree)) {
+	    dissector_try_uint(dccp_subdissector_table, high_port, next_tvb, pinfo, tree)) {
 		return;
 	}
 
@@ -1157,7 +1157,7 @@ void proto_reg_handoff_dccp(void)
 	dissector_handle_t dccp_handle;
 
 	dccp_handle = create_dissector_handle(dissect_dccp, proto_dccp);
-	dissector_add("ip.proto", IP_PROTO_DCCP, dccp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_DCCP, dccp_handle);
 	data_handle = find_dissector("data");
 	dccp_tap = register_tap("dccp");
 }
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 91540a89ab..d4677520fb 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -6651,11 +6651,11 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off
 }
 
 static void range_delete_dcm_tcp_callback(guint32 port) {
-    dissector_delete("tcp.port", port, dcm_handle);
+    dissector_delete_uint("tcp.port", port, dcm_handle);
 }
 
 static void range_add_dcm_tcp_callback(guint32 port) {
-    dissector_add("tcp.port", port, dcm_handle);
+    dissector_add_uint("tcp.port", port, dcm_handle);
 }
 
 static void dcm_apply_settings(void) {
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 3d0cd1f528..439f5c7321 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -603,7 +603,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
     }
   }
   offset += 2;
-  dissector_try_port(af_dissector_table, pt, next_tvb, pinfo, tree);
+  dissector_try_uint(af_dissector_table, pt, next_tvb, pinfo, tree);
 }
 
 /** Dissect the Tag Packet Layer.
@@ -675,7 +675,7 @@ proto_reg_handoff_dcp_etsi (void)
   dissector_add_string("dcp-etsi.sync", "AF", af_handle);
   dissector_add_string("dcp-etsi.sync", "PF", pft_handle);
   /* if there are ever other payload types ...*/
-  dissector_add("dcp-af.pt", 'T', tpl_handle);
+  dissector_add_uint("dcp-af.pt", 'T', tpl_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index c78910c3b4..e25669a190 100644
--- a/epan/dissectors/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
@@ -206,5 +206,5 @@ proto_reg_handoff_ddtp(void)
     dissector_handle_t ddtp_handle;
 
     ddtp_handle = new_create_dissector_handle(dissect_ddtp, proto_ddtp);
-    dissector_add("udp.port", UDP_PORT_DDTP, ddtp_handle);
+    dissector_add_uint("udp.port", UDP_PORT_DDTP, ddtp_handle);
 }
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index f2169354ae..6fbbd6a1f1 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -283,7 +283,7 @@ proto_reg_handoff_dec_bpdu(void)
 
   dec_bpdu_handle = create_dissector_handle(dissect_dec_bpdu,
 					    proto_dec_bpdu);
-  dissector_add("ethertype", ETHERTYPE_DEC_LB, dec_bpdu_handle);
-  dissector_add("chdlctype", ETHERTYPE_DEC_LB, dec_bpdu_handle);
-  dissector_add("ppp.protocol", PPP_DEC_LB, dec_bpdu_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_DEC_LB, dec_bpdu_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_DEC_LB, dec_bpdu_handle);
+  dissector_add_uint("ppp.protocol", PPP_DEC_LB, dec_bpdu_handle);
 }
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index d27eb47d8d..a9b8e62eaf 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -1545,8 +1545,8 @@ proto_reg_handoff_dec_rt(void)
 
   dec_rt_handle = create_dissector_handle(dissect_dec_rt,
                         proto_dec_rt);
-  dissector_add("ethertype", ETHERTYPE_DNA_RT, dec_rt_handle);
-  dissector_add("chdlctype", ETHERTYPE_DNA_RT, dec_rt_handle);
-  dissector_add("ppp.protocol", PPP_DEC4, dec_rt_handle);
-/*  dissector_add("ppp.protocol", PPP_DECNETCP, dec_rt_handle);*/
+  dissector_add_uint("ethertype", ETHERTYPE_DNA_RT, dec_rt_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_DNA_RT, dec_rt_handle);
+  dissector_add_uint("ppp.protocol", PPP_DEC4, dec_rt_handle);
+/*  dissector_add_uint("ppp.protocol", PPP_DECNETCP, dec_rt_handle);*/
 }
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index af75a0f2b1..ccb8fdf3d0 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -2515,6 +2515,6 @@ proto_reg_handoff_dect(void)
 	dissector_handle_t dect_handle;
 
 	dect_handle = create_dissector_handle(dissect_dect, proto_dect);
-	dissector_add("ethertype", ETHERTYPE_DECT , dect_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_DECT , dect_handle);
 }
 
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index b1d51cf11d..f7191f6087 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -1205,9 +1205,9 @@ proto_reg_handoff_dhcpfo(void)
 		dhcpfo_handle = create_dissector_handle(dissect_dhcpfo, proto_dhcpfo);
 		initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", saved_tcp_port, dhcpfo_handle);
+		dissector_delete_uint("tcp.port", saved_tcp_port, dhcpfo_handle);
 	}
-	dissector_add("tcp.port", tcp_port_pref, dhcpfo_handle);
+	dissector_add_uint("tcp.port", tcp_port_pref, dhcpfo_handle);
 	saved_tcp_port = tcp_port_pref;
 }
 
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 84abe3de4d..b243b2e206 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -1963,9 +1963,9 @@ proto_reg_handoff_dhcpv6(void)
 
     dhcpv6_handle = create_dissector_handle(dissect_dhcpv6_downstream,
                                             proto_dhcpv6);
-    dissector_add("udp.port", UDP_PORT_DHCPV6_DOWNSTREAM, dhcpv6_handle);
+    dissector_add_uint("udp.port", UDP_PORT_DHCPV6_DOWNSTREAM, dhcpv6_handle);
     dhcpv6_handle = create_dissector_handle(dissect_dhcpv6_upstream,
                                             proto_dhcpv6);
-    dissector_add("udp.port", UDP_PORT_DHCPV6_UPSTREAM, dhcpv6_handle);
+    dissector_add_uint("udp.port", UDP_PORT_DHCPV6_UPSTREAM, dhcpv6_handle);
 }
 
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 1abea373db..b4412f5c26 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -479,13 +479,13 @@ dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int offset)
 	/* Call subdissectors for AVP:s */
 	switch (vendorid){
 	case 0:
-		dissector_try_port(diameter_dissector_table, code, subtvb, c->pinfo, avp_tree);
+		dissector_try_uint(diameter_dissector_table, code, subtvb, c->pinfo, avp_tree);
 		break;
 	case VENDOR_ERICSSON:
-		dissector_try_port(diameter_ericsson_avp_dissector_table, code, subtvb, c->pinfo, avp_tree);
+		dissector_try_uint(diameter_ericsson_avp_dissector_table, code, subtvb, c->pinfo, avp_tree);
 		break;
 	case VENDOR_THE3GPP:
-		dissector_try_port(diameter_3gpp_avp_dissector_table, code, subtvb, c->pinfo, avp_tree);
+		dissector_try_uint(diameter_3gpp_avp_dissector_table, code, subtvb, c->pinfo, avp_tree);
 		break;
 	default:
 		break;
@@ -1405,25 +1405,25 @@ dictionary_load(void)
 static void
 tcp_range_delete_callback(guint32 port)
 {
-	dissector_delete("tcp.port", port, diameter_tcp_handle);
+	dissector_delete_uint("tcp.port", port, diameter_tcp_handle);
 }
 
 static void
 tcp_range_add_callback(guint32 port)
 {
-	dissector_add("tcp.port", port, diameter_tcp_handle);
+	dissector_add_uint("tcp.port", port, diameter_tcp_handle);
 }
 
 static void
 sctp_range_delete_callback(guint32 port)
 {
-	dissector_delete("sctp.port", port, diameter_sctp_handle);
+	dissector_delete_uint("sctp.port", port, diameter_sctp_handle);
 }
 
 static void
 sctp_range_add_callback(guint32 port)
 {
-	dissector_add("sctp.port", port, diameter_sctp_handle);
+	dissector_add_uint("sctp.port", port, diameter_sctp_handle);
 }
 
 /* registration with the filtering engine */
@@ -1633,13 +1633,13 @@ proto_reg_handoff_diameter(void)
 		eap_handle = find_dissector("eap");
 		/* Register special decoding for some AVP:s */
 		/* AVP Code: 266 Vendor-Id */
-		dissector_add("diameter.base", 266,
+		dissector_add_uint("diameter.base", 266,
 				new_create_dissector_handle(dissect_diameter_vedor_id, proto_diameter));
 		/* AVP Code: 462 EAP-Payload */
-		dissector_add("diameter.base", 462,
+		dissector_add_uint("diameter.base", 462,
 			new_create_dissector_handle(dissect_diameter_eap_payload, proto_diameter));
 		/* AVP Code: 463 EAP-Reissued-Payload */
-		dissector_add("diameter.base", 463,
+		dissector_add_uint("diameter.base", 463,
 			new_create_dissector_handle(dissect_diameter_eap_payload, proto_diameter));
 
 		Initialized=TRUE;
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 1f13028f1f..9a2874c326 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -472,50 +472,50 @@ proto_reg_handoff_diameter_3gpp(void)
 	 */
 
 	/* AVP Code: 606 User-Data */
-	dissector_add("diameter.3gpp", 606, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 606, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp));
 
 	/* AVP Code: 701 MSISDN */
-	dissector_add("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp));
 
 	/* AVP Code: 702 User-Data */
-	dissector_add("diameter.3gpp", 702, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 702, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp));
 
 	/* AVP Code: 900 TMGI */
-	dissector_add("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp));
 
 	/* AVP Code: 904 MBMS-Session-Duration */
 	/* AVP Code: 911 MBMS-Time-To-Data-Transfer */
 	/* Registered by packet-gtp.c */
 
 	/* AVP Code: 913 MBMS-Required-QoS */
-	dissector_add("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp));
 
 	/* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */
-	dissector_add("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp));
 
 	/* AVP Code: 1405 ULR-Flags */
-	dissector_add("diameter.3gpp", 1405, new_create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1405, new_create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1406 ULA-Flags */
-	dissector_add("diameter.3gpp", 1406, new_create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1406, new_create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1421 DSR-Flags */
-	dissector_add("diameter.3gpp", 1421, new_create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1421, new_create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1422 DSA-Flags */
-	dissector_add("diameter.3gpp", 1422, new_create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1422, new_create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1441 IDA-Flags */
-	dissector_add("diameter.3gpp", 1441, new_create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1441, new_create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1442 PUA-Flags */
-	dissector_add("diameter.3gpp", 1442, new_create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1442, new_create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1443 NOR-Flags */
-	dissector_add("diameter.3gpp", 1443, new_create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1443, new_create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp));
 
 	/* AVP Code: 1490 IDR-Flags */
-	dissector_add("diameter.3gpp", 1490, new_create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp));
+	dissector_add_uint("diameter.3gpp", 1490, new_create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp));
 
 	xml_handle = find_dissector("xml");
 }
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index bf9d15b55a..eadcbae181 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -831,10 +831,10 @@ void proto_reg_handoff_dis(void)
     }
     else
     {
-        dissector_delete("udp.port", saved_dis_udp_port, dis_dissector_handle);
+        dissector_delete_uint("udp.port", saved_dis_udp_port, dis_dissector_handle);
     }
 
-    dissector_add("udp.port", dis_udp_port, dis_dissector_handle);
+    dissector_add_uint("udp.port", dis_udp_port, dis_dissector_handle);
     saved_dis_udp_port = dis_udp_port;
 }
 
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index a18e6c02af..264cb67a87 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -2199,12 +2199,12 @@ prefs_register_disp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_disp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_disp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_disp_tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 34cc87e8fd..ceebf4b18b 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -426,8 +426,8 @@ proto_reg_handoff_distcc(void)
 		 * of "distcc_tcp_port"; we might be changing the TCP port
 		 * number, so remove that registration.
 		 */
-		dissector_delete("tcp.port", distcc_tcp_port, distcc_handle);
+		dissector_delete_uint("tcp.port", distcc_tcp_port, distcc_handle);
 	}
 	distcc_tcp_port = glb_distcc_tcp_port;
-	dissector_add("tcp.port", distcc_tcp_port, distcc_handle);
+	dissector_add_uint("tcp.port", distcc_tcp_port, distcc_handle);
 }
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index abf4f25006..bd9a06bf57 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -1245,14 +1245,14 @@ proto_reg_handoff_dlm3(void)
     dlm3_tcp_handle = new_create_dissector_handle(dissect_dlm3, proto_dlm3);
     dissector_registered = TRUE;
   } else {
-    dissector_delete("tcp.port",  tcp_port,  dlm3_tcp_handle);
-    dissector_delete("sctp.port", sctp_port, dlm3_sctp_handle);
+    dissector_delete_uint("tcp.port",  tcp_port,  dlm3_tcp_handle);
+    dissector_delete_uint("sctp.port", sctp_port, dlm3_sctp_handle);
   }
 
   tcp_port  = dlm3_tcp_port;
   sctp_port = dlm3_sctp_port;
-  dissector_add("tcp.port",  tcp_port,  dlm3_tcp_handle);
-  dissector_add("sctp.port", sctp_port, dlm3_sctp_handle);
+  dissector_add_uint("tcp.port",  tcp_port,  dlm3_tcp_handle);
+  dissector_add_uint("sctp.port", sctp_port, dlm3_sctp_handle);
 }
 
 /* packet-dlm3.c ends here. */
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 17eb5090ed..fc53d34493 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -545,8 +545,8 @@ proto_reg_handoff_dlsw(void)
   dissector_handle_t dlsw_udp_handle, dlsw_tcp_handle;
 
   dlsw_udp_handle = new_create_dissector_handle(dissect_dlsw_udp, proto_dlsw);
-  dissector_add("udp.port", UDP_PORT_DLSW, dlsw_udp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_DLSW, dlsw_udp_handle);
 
   dlsw_tcp_handle = new_create_dissector_handle(dissect_dlsw_tcp, proto_dlsw);
-  dissector_add("tcp.port", TCP_PORT_DLSW, dlsw_tcp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_DLSW, dlsw_tcp_handle);
 }
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 4abb3bcadd..253e92dae0 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -4347,12 +4347,12 @@ void proto_register_dmp (void)
 
 static void range_delete_callback (guint32 port)
 {
-    dissector_delete ("udp.port", port, dmp_handle);
+    dissector_delete_uint ("udp.port", port, dmp_handle);
 }
 
 static void range_add_callback (guint32 port)
 {
-    dissector_add ("udp.port", port, dmp_handle);
+    dissector_add_uint ("udp.port", port, dmp_handle);
 }
 
 void proto_reg_handoff_dmp (void)
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 8b4de4dcba..109ee0a069 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -3107,8 +3107,8 @@ proto_reg_handoff_dnp3(void)
 
   dnp3_tcp_handle = new_create_dissector_handle(dissect_dnp3_tcp, proto_dnp3);
   dnp3_udp_handle = new_create_dissector_handle(dissect_dnp3_udp, proto_dnp3);
-  dissector_add("tcp.port", TCP_PORT_DNP, dnp3_tcp_handle);
-  dissector_add("udp.port", UDP_PORT_DNP, dnp3_udp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_DNP, dnp3_tcp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_DNP, dnp3_udp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 74abb2de12..dcc6525053 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -3690,14 +3690,14 @@ proto_reg_handoff_dns(void)
   mdns_udp_handle = create_dissector_handle(dissect_mdns_udp, proto_dns);
   llmnr_udp_handle = create_dissector_handle(dissect_llmnr_udp, proto_dns);
 
-  dissector_add("udp.port", UDP_PORT_DNS, dns_udp_handle);
-  dissector_add("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
-  dissector_add("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
-  dissector_add("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
-  dissector_add("udp.port", UDP_PORT_LLMNR, llmnr_udp_handle);
-  dissector_add("sctp.port", SCTP_PORT_DNS, dns_sctp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_DNS, dns_udp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_LLMNR, llmnr_udp_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_DNS, dns_sctp_handle);
 #if 0
-  dissector_add("sctp.ppi",  DNS_PAYLOAD_PROTOCOL_ID, dns_sctp_handle);
+  dissector_add_uint("sctp.ppi",  DNS_PAYLOAD_PROTOCOL_ID, dns_sctp_handle);
 #endif
 
   gssapi_handle = find_dissector("gssapi");
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 9674cc3acb..74ff3a6721 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -3146,12 +3146,12 @@ prefs_register_dop(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dop_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c
index 6ebc868396..9ae4334c32 100644
--- a/epan/dissectors/packet-dpnss-link.c
+++ b/epan/dissectors/packet-dpnss-link.c
@@ -221,7 +221,7 @@ proto_reg_handoff_dpnss_link(void)
 	dissector_handle_t dpnss_link_handle;
 
 	dpnss_link_handle = find_dissector("dpnss_link");
-	dissector_add("wtap_encap", WTAP_ENCAP_DPNSS, dpnss_link_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_DPNSS, dpnss_link_handle);
 
 	dpnss_handle = find_dissector("dpnss");
 }
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index dc25cdc95f..6449f40dd0 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -898,7 +898,7 @@ proto_reg_handoff_dsi(void)
 	dissector_handle_t dsi_handle;
 
 	dsi_handle = create_dissector_handle(dissect_dsi, proto_dsi);
-	dissector_add("tcp.port", TCP_PORT_DSI, dsi_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_DSI, dsi_handle);
 
 	data_handle = find_dissector("data");
 	afp_handle = find_dissector("afp");
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 7ef885ccf9..3ca515735e 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -2693,12 +2693,12 @@ prefs_register_dsp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dsp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dsp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dsp_tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 6659e1ad80..ac80b6767c 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -2578,11 +2578,11 @@ proto_reg_handoff_bundle(void)
 	Initialized = TRUE;
     }
     else {
-	dissector_delete("tcp.port", tcp_port, tcp_bundle_handle);
-	dissector_delete("udp.port", udp_port, udp_bundle_handle);
+	dissector_delete_uint("tcp.port", tcp_port, tcp_bundle_handle);
+	dissector_delete_uint("udp.port", udp_port, udp_bundle_handle);
     }
     tcp_port = bundle_tcp_port;
     udp_port = bundle_udp_port;
-    dissector_add("tcp.port", tcp_port, tcp_bundle_handle);
-    dissector_add("udp.port", udp_port, udp_bundle_handle);
+    dissector_add_uint("tcp.port", tcp_port, tcp_bundle_handle);
+    dissector_add_uint("udp.port", udp_port, udp_bundle_handle);
 }
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 38d6338469..ee545a0bd0 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -233,5 +233,5 @@ proto_reg_handoff_dtp(void)
 	dissector_handle_t dtp_handle;
 
 	dtp_handle = create_dissector_handle(dissect_dtp, proto_dtp);
-	dissector_add("llc.cisco_pid", 0x2004, dtp_handle);
+	dissector_add_uint("llc.cisco_pid", 0x2004, dtp_handle);
 }
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index 92c2701fc5..70fab56e00 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -1184,13 +1184,13 @@ proto_reg_handoff_dtpt(void)
 		data_handle = find_dissector("data");
 		Initialized=TRUE;
 	} else {
-		dissector_delete("tcp.port", ServerPort, dtpt_handle);
+		dissector_delete_uint("tcp.port", ServerPort, dtpt_handle);
 	}
 
 	/* set port for future deletes */
 	ServerPort=gbl_dtptServerPort;
 
-	dissector_add("tcp.port", gbl_dtptServerPort, dtpt_handle);
+	dissector_add_uint("tcp.port", gbl_dtptServerPort, dtpt_handle);
 }
 
 
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index d594a7d548..da9f749b77 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -768,5 +768,5 @@ proto_reg_handoff_dua(void)
   dua_handle  = find_dissector("dua");
   data_handle = find_dissector("data");
   dpnss_handle = find_dissector("dpnss");
-  dissector_add("sctp.ppi", DUA_PAYLOAD_PROTOCOL_ID, dua_handle);
+  dissector_add_uint("sctp.ppi", DUA_PAYLOAD_PROTOCOL_ID, dua_handle);
 }
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 6f89c2ab3b..b020d4e427 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -660,7 +660,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    * PPP interfaces, with LEAP traffic on all of them?  How can we
    * keep them separate?  (Or is that not going to happen?)
    */
-  if (pinfo->destport == pinfo->match_port) {
+  if (pinfo->destport == pinfo->match_uint) {
     conversation = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src,
 				     pinfo->ptype, pinfo->destport,
 				     0, NO_PORT_B);
@@ -670,7 +670,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				     0, NO_PORT_B);
   }
   if (conversation == NULL) {
-    if (pinfo->destport == pinfo->match_port) {
+    if (pinfo->destport == pinfo->match_uint) {
       conversation = conversation_new(pinfo->fd->num, &pinfo->dst, &pinfo->src,
 				      pinfo->ptype, pinfo->destport,
 				      0, NO_PORT2);
@@ -1297,5 +1297,5 @@ proto_reg_handoff_eap(void)
   ssl_handle = find_dissector("ssl");
 
   eap_handle = find_dissector("eap");
-  dissector_add("ppp.protocol", PPP_EAP, eap_handle);
+  dissector_add_uint("ppp.protocol", PPP_EAP, eap_handle);
 }
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 8c809fd3db..4450a862ae 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -466,6 +466,6 @@ proto_reg_handoff_eapol(void)
   data_handle = find_dissector("data");
 
   eapol_handle = create_dissector_handle(dissect_eapol, proto_eapol);
-  dissector_add("ethertype", ETHERTYPE_EAPOL, eapol_handle);
-  dissector_add("ethertype", ETHERTYPE_RSN_PREAUTH, eapol_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_EAPOL, eapol_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_RSN_PREAUTH, eapol_handle);
 }
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index fcb5204b49..c71d015bd6 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -117,8 +117,8 @@ void proto_reg_handoff_echo(void)
 
   echo_handle = create_dissector_handle(dissect_echo, proto_echo);
 
-  dissector_add("udp.port", ECHO_PORT, echo_handle);
-  dissector_add("tcp.port", ECHO_PORT, echo_handle);
+  dissector_add_uint("udp.port", ECHO_PORT, echo_handle);
+  dissector_add_uint("tcp.port", ECHO_PORT, echo_handle);
 
 }
 
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 5c1e5ed055..0622c9b10a 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -3430,11 +3430,11 @@ void proto_reg_handoff_edonkey(void) {
     edonkey_tcp_handle = find_dissector("edonkey.tcp");
     edonkey_udp_handle = find_dissector("edonkey.udp");
 
-    dissector_add("tcp.port", 4661, edonkey_tcp_handle);
-    dissector_add("tcp.port", 4662, edonkey_tcp_handle);
-    dissector_add("tcp.port", 4663, edonkey_tcp_handle);
-    dissector_add("udp.port", 4665, edonkey_udp_handle);
-    dissector_add("udp.port", 4672, edonkey_udp_handle);
+    dissector_add_uint("tcp.port", 4661, edonkey_tcp_handle);
+    dissector_add_uint("tcp.port", 4662, edonkey_tcp_handle);
+    dissector_add_uint("tcp.port", 4663, edonkey_tcp_handle);
+    dissector_add_uint("udp.port", 4665, edonkey_udp_handle);
+    dissector_add_uint("udp.port", 4672, edonkey_udp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index 11a2449b38..10c9ff8d3d 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -245,7 +245,7 @@ void proto_reg_handoff_egd(void)
   dissector_handle_t egd_handle;
 
   egd_handle = create_dissector_handle(dissect_egd, proto_egd);
-  dissector_add("udp.port", EGD_PORT, egd_handle);
+  dissector_add_uint("udp.port", EGD_PORT, egd_handle);
 
   /* find data dissector */
   data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 53666c9a06..6066fa782d 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -1772,7 +1772,7 @@ void proto_reg_handoff_eigrp(void) {
 
 	ipxsap_handle = find_dissector("ipxsap");
 	eigrp_handle = create_dissector_handle(dissect_eigrp, proto_eigrp);
-	dissector_add("ip.proto", IP_PROTO_EIGRP, eigrp_handle);
-	dissector_add("ddp.type", DDP_EIGRP, eigrp_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_EIGRP, eigrp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_EIGRP, eigrp_handle);
+	dissector_add_uint("ddp.type", DDP_EIGRP, eigrp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_EIGRP, eigrp_handle);
 }
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index 04b3f79eb7..4e41f7b8e9 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -194,5 +194,5 @@ proto_reg_handoff_enc(void)
   data_handle = find_dissector("data");
 
   enc_handle = create_dissector_handle(dissect_enc, proto_enc);
-  dissector_add("wtap_encap", WTAP_ENCAP_ENC, enc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_ENC, enc_handle);
 }
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index de78102631..645b1dd955 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -749,7 +749,7 @@ dissect_cpf( enip_request_key_t *request_key, int command, tvbuff_t *tvb, packet
                /* Call dissector for interface */
                next_tvb = tvb_new_subset( tvb, offset+6, item_length, item_length );
                p_add_proto_data(pinfo->fd, proto_enip, request_info);
-               if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_port(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, g_tree) )
+               if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_uint(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, g_tree) )
                {
                   /* Show the undissected payload */
                    if( tvb_length_remaining(tvb, offset) > 0 )
@@ -783,7 +783,7 @@ dissect_cpf( enip_request_key_t *request_key, int command, tvbuff_t *tvb, packet
                   /* Call dissector for interface */
                   next_tvb = tvb_new_subset (tvb, offset+8, item_length-2, item_length-2);
                   p_add_proto_data(pinfo->fd, proto_enip, request_info);
-                  if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_port(subdissector_sud_table, ifacehndl, next_tvb, pinfo, g_tree) )
+                  if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_uint(subdissector_sud_table, ifacehndl, next_tvb, pinfo, g_tree) )
                   {
                      /* Show the undissected payload */
                       if( tvb_length_remaining(tvb, offset) > 0 )
@@ -1716,21 +1716,21 @@ proto_reg_handoff_enip(void)
 
    /* Register for EtherNet/IP, using TCP */
    enip_tcp_handle = new_create_dissector_handle(dissect_enip_tcp, proto_enip);
-   dissector_add("tcp.port", ENIP_ENCAP_PORT, enip_tcp_handle);
+   dissector_add_uint("tcp.port", ENIP_ENCAP_PORT, enip_tcp_handle);
 
    /* Register for EtherNet/IP, using UDP */
    enip_udp_handle = new_create_dissector_handle(dissect_enip_udp, proto_enip);
-   dissector_add("udp.port", ENIP_ENCAP_PORT, enip_udp_handle);
+   dissector_add_uint("udp.port", ENIP_ENCAP_PORT, enip_udp_handle);
 
    /* Register for EtherNet/IP IO data (UDP) */
    enipio_handle = create_dissector_handle(dissect_enipio, proto_enip);
-   dissector_add("udp.port", ENIP_IO_PORT, enipio_handle);
+   dissector_add_uint("udp.port", ENIP_IO_PORT, enipio_handle);
 
    /* Find dissector for data packet */
    data_handle = find_dissector("data");
 
    /* Register for EtherNet/IP Device Level Ring protocol */
    dlr_handle = new_create_dissector_handle(dissect_dlr, proto_dlr);
-   dissector_add("ethertype", ETHERTYPE_DLR, dlr_handle);
+   dissector_add_uint("ethertype", ETHERTYPE_DLR, dlr_handle);
 
 } /* end of proto_reg_handoff_enip() */
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index 3ba07c6cce..6db79be946 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -1095,7 +1095,7 @@ proto_reg_handoff_enrp(void)
   dissector_handle_t enrp_handle;
 
   enrp_handle = create_dissector_handle(dissect_enrp, proto_enrp);
-  dissector_add("sctp.ppi",  ENRP_PAYLOAD_PROTOCOL_ID, enrp_handle);
-  dissector_add("sctp.port", ENRP_SCTP_PORT,           enrp_handle);
-  dissector_add("udp.port",  ENRP_UDP_PORT,            enrp_handle);
+  dissector_add_uint("sctp.ppi",  ENRP_PAYLOAD_PROTOCOL_ID, enrp_handle);
+  dissector_add_uint("sctp.port", ENRP_SCTP_PORT,           enrp_handle);
+  dissector_add_uint("udp.port",  ENRP_UDP_PORT,            enrp_handle);
 }
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index d17f8acd98..6e6ccccb19 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -546,13 +546,13 @@ proto_reg_handoff_enttec(void) {
 		enttec_handle = create_dissector_handle(dissect_enttec,proto_enttec);
 		enttec_initialized = TRUE;
 	} else {
-		dissector_delete("udp.port",udp_port_enttec,enttec_handle);
-		dissector_delete("tcp.port",tcp_port_enttec,enttec_handle);
+		dissector_delete_uint("udp.port",udp_port_enttec,enttec_handle);
+		dissector_delete_uint("tcp.port",tcp_port_enttec,enttec_handle);
 	}
 
 	udp_port_enttec = global_udp_port_enttec;
 	tcp_port_enttec = global_tcp_port_enttec;  
 
-	dissector_add("udp.port",global_udp_port_enttec,enttec_handle);
-	dissector_add("tcp.port",global_tcp_port_enttec,enttec_handle);
+	dissector_add_uint("udp.port",global_udp_port_enttec,enttec_handle);
+	dissector_add_uint("tcp.port",global_tcp_port_enttec,enttec_handle);
 }
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 6a2e20367d..550aacc450 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -1511,7 +1511,7 @@ proto_reg_handoff_epl(void)
     dissector_handle_t epl_handle;
 
     epl_handle = new_create_dissector_handle(dissect_epl, proto_epl);
-    dissector_add("ethertype", ETHERTYPE_EPL_V2, epl_handle);
-    dissector_add("udp.port", UDP_PORT_EPL, epl_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_EPL_V2, epl_handle);
+    dissector_add_uint("udp.port", UDP_PORT_EPL, epl_handle);
 }
 
diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c
index b20a6c5544..78574f0f0e 100644
--- a/epan/dissectors/packet-epl_v1.c
+++ b/epan/dissectors/packet-epl_v1.c
@@ -550,5 +550,5 @@ proto_reg_handoff_epl_v1(void)
     dissector_handle_t epl_v1_handle;
 
     epl_v1_handle = new_create_dissector_handle(dissect_epl_v1, proto_epl_v1);
-    dissector_add("ethertype", ETHERTYPE_EPL_V1, epl_v1_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_EPL_V1, epl_v1_handle);
 }
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index 9afc898841..5fe2430208 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -316,5 +316,5 @@ proto_reg_handoff_epmd(void)
 {
     dissector_handle_t epmd_handle;
     epmd_handle = find_dissector("epmd");
-    dissector_add("tcp.port", EPMD_PORT, epmd_handle);
+    dissector_add_uint("tcp.port", EPMD_PORT, epmd_handle);
 }
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index 683aa725ec..fbf3289c56 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -1356,7 +1356,7 @@ proto_reg_handoff_erf(void)
   dissector_handle_t erf_handle;
 
   erf_handle = find_dissector("erf");
-  dissector_add("wtap_encap", WTAP_ENCAP_ERF, erf_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_ERF, erf_handle);
 
   /* Dissector called to dump raw data, or unknown protocol */
   data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c
index 7f35ecd384..d43c069021 100644
--- a/epan/dissectors/packet-esio.c
+++ b/epan/dissectors/packet-esio.c
@@ -415,7 +415,7 @@ proto_reg_handoff_esio(void)
        dissector_handle_t esio_handle;
 
        esio_handle = new_create_dissector_handle(dissect_esio, proto_esio);
-       dissector_add("udp.port", 6060, esio_handle);
+       dissector_add_uint("udp.port", 6060, esio_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 41c66777ea..41166d16fa 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -444,5 +444,5 @@ proto_reg_handoff_esis(void)
   dissector_handle_t esis_handle;
 
   esis_handle = find_dissector("esis");
-  dissector_add("osinl", NLPID_ISO9542_ESIS, esis_handle);
+  dissector_add_uint("osinl", NLPID_ISO9542_ESIS, esis_handle);
 }
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index f3b93a0e7c..e485604c1e 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -972,11 +972,11 @@ void proto_reg_handoff_etch(void)
   }
 
   if(old_etch_port != 0 && old_etch_port != gbl_etch_port){
-    dissector_delete("tcp.port", old_etch_port, etch_handle);
+    dissector_delete_uint("tcp.port", old_etch_port, etch_handle);
   }
 
   if(gbl_etch_port != 0 && old_etch_port != gbl_etch_port) {
-    dissector_add("tcp.port", gbl_etch_port, etch_handle);
+    dissector_add_uint("tcp.port", gbl_etch_port, etch_handle);
   }
 
   old_etch_port = gbl_etch_port;
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 2f35619dbf..61a4b300e5 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -749,14 +749,14 @@ proto_reg_handoff_eth(void)
 	fw1_handle = find_dissector("fw1");
 
 	eth_maybefcs_handle = find_dissector("eth");
-	dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, eth_maybefcs_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_ETHERNET, eth_maybefcs_handle);
 
 	eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
-	dissector_add("ethertype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
-	dissector_add("chdlctype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
-	dissector_add("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
+	dissector_add_uint("chdlctype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
+	dissector_add_uint("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
 
-	dissector_add("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle);
+	dissector_add_uint("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle);
 
 	/*
 	 * This is to handle the output for the Cisco CMTS "cable intercept"
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c
index 46d99c7ac5..fcdea6a4b7 100644
--- a/epan/dissectors/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
@@ -120,5 +120,5 @@ proto_reg_handoff_etherip(void)
 
   eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
   etherip_handle = find_dissector("etherip");
-  dissector_add("ip.proto", IP_PROTO_ETHERIP, etherip_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_ETHERIP, etherip_handle);
 }
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index eb717f9bef..d19e24c7fc 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -256,7 +256,7 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype,
 	saved_proto = pinfo->current_proto;
 	pd_save = pinfo->private_data;
 	TRY {
-		dissector_found = dissector_try_port(ethertype_dissector_table,
+		dissector_found = dissector_try_uint(ethertype_dissector_table,
 		    etype, next_tvb, pinfo, tree);
 	}
 	CATCH(BoundsError) {
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index e1de4beae0..b872192cdd 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -554,11 +554,11 @@ proto_reg_handoff_evrc(void)
     }
     else
     {
-        dissector_delete("rtp.pt", 60, evrc_legacy_handle);
+        dissector_delete_uint("rtp.pt", 60, evrc_legacy_handle);
     }
 
     if (legacy_pt_60)
     {
-        dissector_add("rtp.pt", 60, evrc_legacy_handle);
+        dissector_add_uint("rtp.pt", 60, evrc_legacy_handle);
     }
 }
diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c
index 8db6f41e1c..43ec382ea5 100644
--- a/epan/dissectors/packet-exec.c
+++ b/epan/dissectors/packet-exec.c
@@ -410,7 +410,7 @@ proto_reg_handoff_exec(void)
 	dissector_handle_t exec_handle;
 
 	exec_handle = create_dissector_handle(dissect_exec, proto_exec);
-	dissector_add("tcp.port", EXEC_PORT, exec_handle);
+	dissector_add_uint("tcp.port", EXEC_PORT, exec_handle);
 }
 
 /* Custom function to check if an entire string is printable. */
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index b0c03e749d..009ad3b6a3 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -1490,7 +1490,7 @@ proto_reg_handoff_edp(void)
 	dissector_handle_t edp_handle;
 
 	edp_handle = create_dissector_handle(dissect_edp, proto_edp);
-	dissector_add("llc.extreme_pid", 0x00bb, edp_handle);
+	dissector_add_uint("llc.extreme_pid", 0x00bb, edp_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 82ed4c1c88..6fbf71c38e 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -1222,7 +1222,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
             void *saved_private_data;
             saved_private_data = pinfo->private_data;
             pinfo->private_data = &fchdr;
-            if (!dissector_try_port (fcftype_dissector_table, ftype,
+            if (!dissector_try_uint (fcftype_dissector_table, ftype,
                                 next_tvb, pinfo, tree)) {
                 call_dissector (data_handle, next_tvb, pinfo, tree);
             }
@@ -1584,10 +1584,10 @@ proto_reg_handoff_fc (void)
     dissector_handle_t fcsof_handle;
 
     fc_handle = find_dissector("fc");
-    dissector_add("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2, fc_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2, fc_handle);
 
     fcsof_handle = find_dissector("fcsof");
-    dissector_add("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS, fcsof_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS, fcsof_handle);
 
     data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 100ce684a7..ba55ca693f 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -221,7 +221,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      * chain since the fc_ct header is common to the sub-protocols.
      */
     next_tvb = tvb_new_subset_remaining (tvb, 0);
-    if (!dissector_try_port (fcct_gserver_table, server, next_tvb, pinfo,
+    if (!dissector_try_uint (fcct_gserver_table, server, next_tvb, pinfo,
                              tree)) {
         call_dissector (data_handle, next_tvb, pinfo, tree);
     }
@@ -301,7 +301,7 @@ proto_reg_handoff_fcct (void)
     dissector_handle_t fcct_handle;
 
     fcct_handle = create_dissector_handle (dissect_fcct, proto_fcct);
-    dissector_add("fc.ftype", FC_FTYPE_FCCT, fcct_handle);
+    dissector_add_uint("fc.ftype", FC_FTYPE_FCCT, fcct_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index ae5e48d662..b02ed0648f 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -2001,8 +2001,8 @@ proto_reg_handoff_fcdns (void)
     dissector_handle_t dns_handle;
 
     dns_handle = create_dissector_handle (dissect_fcdns, proto_fcdns);
-    dissector_add("fcct.server", FCCT_GSRVR_DNS, dns_handle);
-    dissector_add("fcct.server", FCCT_GSRVR_UNS, dns_handle);
+    dissector_add_uint("fcct.server", FCCT_GSRVR_DNS, dns_handle);
+    dissector_add_uint("fcct.server", FCCT_GSRVR_UNS, dns_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 4de1e6c31a..225d38248c 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -2689,7 +2689,7 @@ proto_reg_handoff_fcels (void)
     dissector_handle_t els_handle;
 
     els_handle = create_dissector_handle (dissect_fcels, proto_fcels);
-    dissector_add("fc.ftype", FC_FTYPE_ELS, els_handle);
+    dissector_add_uint("fc.ftype", FC_FTYPE_ELS, els_handle);
 
     data_handle = find_dissector ("data");
     fcsp_handle = find_dissector ("fcsp");
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index b92fc72f90..a51f74d997 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -1126,7 +1126,7 @@ proto_reg_handoff_fcfcs (void)
 
     fcs_handle = create_dissector_handle (dissect_fcfcs, proto_fcfcs);
 
-    dissector_add("fcct.server", FCCT_GSRVR_FCS, fcs_handle);
+    dissector_add_uint("fcct.server", FCCT_GSRVR_FCS, fcs_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index d2e650f2f7..8606a59db3 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -927,7 +927,7 @@ proto_reg_handoff_fcfzs (void)
     dissector_handle_t fzs_handle;
 
     fzs_handle = create_dissector_handle (dissect_fcfzs, proto_fcfzs);
-    dissector_add("fcct.server", FCCT_GSRVR_FZS, fzs_handle);
+    dissector_add_uint("fcct.server", FCCT_GSRVR_FZS, fzs_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c
index 46623e829b..2edad61971 100644
--- a/epan/dissectors/packet-fcgi.c
+++ b/epan/dissectors/packet-fcgi.c
@@ -419,11 +419,11 @@ proto_reg_handoff_fcgi(void)
       dissector_add_handle("tcp.port", fcgi_handle);  /* for "decode as" */
       initialized = TRUE;
    } else if (saved_tcp_port != 0) {
-      dissector_delete("tcp.port", saved_tcp_port, fcgi_handle);
+      dissector_delete_uint("tcp.port", saved_tcp_port, fcgi_handle);
    }
 
    if (tcp_port != 0) {
-      dissector_add("tcp.port", tcp_port, fcgi_handle);
+      dissector_add_uint("tcp.port", tcp_port, fcgi_handle);
    }
 
    saved_tcp_port = tcp_port;
diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index bd58214a88..09094df5f6 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -334,7 +334,7 @@ proto_reg_handoff_fcoe(void)
     dissector_handle_t fcoe_handle;
     
     fcoe_handle = create_dissector_handle(dissect_fcoe, proto_fcoe);
-    dissector_add("ethertype", ETHERTYPE_FCOE, fcoe_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_FCOE, fcoe_handle);
     data_handle = find_dissector("data");
     fc_handle = find_dissector("fc");
 }
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 307c984b1b..b0270cfbf6 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -904,7 +904,7 @@ proto_reg_handoff_fcp (void)
     dissector_handle_t fcp_handle;
 
     fcp_handle = create_dissector_handle (dissect_fcp, proto_fcp);
-    dissector_add("fc.ftype", FC_FTYPE_SCSI, fcp_handle);
+    dissector_add_uint("fc.ftype", FC_FTYPE_SCSI, fcp_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index c0b7e377fe..8a35492be7 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -1333,7 +1333,7 @@ proto_reg_handoff_fcsbccs (void)
     fc_sbccs_handle = create_dissector_handle (dissect_fc_sbccs,
                                                proto_fc_sbccs);
 
-    dissector_add("fc.ftype", FC_FTYPE_SBCCS, fc_sbccs_handle);
+    dissector_add_uint("fc.ftype", FC_FTYPE_SBCCS, fc_sbccs_handle);
 
     data_handle = find_dissector ("data");
 }
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 7ea2c0fa54..60565f5465 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -2350,7 +2350,7 @@ proto_reg_handoff_fcswils (void)
     dissector_handle_t swils_handle;
 
     swils_handle = create_dissector_handle (dissect_fcswils, proto_fcswils);
-    dissector_add("fc.ftype", FC_FTYPE_SWILS, swils_handle);
+    dissector_add_uint("fc.ftype", FC_FTYPE_SWILS, swils_handle);
 
     data_handle = find_dissector ("data");
     fcsp_handle = find_dissector ("fcsp");
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index c7de142657..8051685206 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -497,9 +497,9 @@ proto_reg_handoff_fddi(void)
 	data_handle = find_dissector("data");
 
 	fddi_handle = find_dissector("fddi");
-	dissector_add("wtap_encap", WTAP_ENCAP_FDDI, fddi_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_FDDI, fddi_handle);
 	fddi_bitswapped_handle =
 	    create_dissector_handle(dissect_fddi_bitswapped, proto_fddi);
-	dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED,
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED,
 	    fddi_bitswapped_handle);
 }
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c
index b2cb62cd1b..66b7b0df56 100644
--- a/epan/dissectors/packet-fefd.c
+++ b/epan/dissectors/packet-fefd.c
@@ -290,5 +290,5 @@ proto_reg_handoff_fefd(void)
 
     data_handle = find_dissector("data");
     fefd_handle = create_dissector_handle(dissect_fefd, proto_fefd);
-    dissector_add("llc.force10_pid", 0x0111, fefd_handle);
+    dissector_add_uint("llc.force10_pid", 0x0111, fefd_handle);
 }
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 940944d62d..09efc8198d 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -16817,15 +16817,15 @@ proto_reg_handoff_ff(void)
 	 *
 	 * - Device Annunciation
 	 */
-	dissector_add("udp.port", UDP_PORT_FF_ANNUNC, ff_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_FF_ANNUNC, ff_udp_handle);
 
 	/*
 	 * 4.8.4.2. Use
 	 *
 	 * - Client / Server
 	 */
-	dissector_add("udp.port", UDP_PORT_FF_FMS, ff_udp_handle);
-	dissector_add("tcp.port", TCP_PORT_FF_FMS, ff_tcp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_FF_FMS, ff_udp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_FF_FMS, ff_tcp_handle);
 
 	/*
 	 * 4.8.4.2. Use
@@ -16834,14 +16834,14 @@ proto_reg_handoff_ff(void)
 	 * - SM Identify
 	 * - SM Find Tag
 	 */
-	dissector_add("udp.port", UDP_PORT_FF_SM, ff_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_FF_SM, ff_udp_handle);
 
 	/*
 	 * 4.8.4.2. Use
 	 *
 	 * - LAN Redundancy Get and Put Information
 	 */
-	dissector_add("udp.port", UDP_PORT_FF_LR_PORT, ff_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_FF_LR_PORT, ff_udp_handle);
 
 	return;
 }
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 8261e082f2..f746472b80 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -728,6 +728,6 @@ proto_reg_handoff_fip(void)
     dissector_handle_t fip_handle;
 
     fip_handle = create_dissector_handle(dissect_fip, proto_fip);
-    dissector_add("ethertype", ETHERTYPE_FIP, fip_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_FIP, fip_handle);
     fc_handle = find_dissector("fc");
 }
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index bf1dbe5a81..d160146329 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -450,11 +450,11 @@ dissect_fix_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 /* Register the protocol with Wireshark */
 static void range_delete_fix_tcp_callback(guint32 port) {
-	dissector_delete("tcp.port", port, fix_handle);
+	dissector_delete_uint("tcp.port", port, fix_handle);
 }
 
 static void range_add_fix_tcp_callback(guint32 port) {
-	dissector_add("tcp.port", port, fix_handle);
+	dissector_add_uint("tcp.port", port, fix_handle);
 }
 
 static void fix_prefs(void)
diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c
index 13d9269a8b..9d0be5d2b1 100644
--- a/epan/dissectors/packet-flip.c
+++ b/epan/dissectors/packet-flip.c
@@ -789,7 +789,7 @@ proto_reg_handoff_flip(void)
 
     if (flip_prefs_initialized == FALSE) {
         flip_handle = new_create_dissector_handle(dissect_flip, proto_flip);
-        dissector_add("ethertype", ETHERTYPE_FLIP, flip_handle);
+        dissector_add_uint("ethertype", ETHERTYPE_FLIP, flip_handle);
 
         rtp_handle  = find_dissector("rtp");
         rtcp_handle = find_dissector("rtcp");
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index fe02d972d5..7b23e26c8d 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -732,9 +732,9 @@ static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo,
    * Either that, or it's Q.933 iff the DLCI is 0.
    */
   next_tvb = tvb_new_subset_remaining(tvb,offset);
-  if (dissector_try_port(osinl_subdissector_table, fr_nlpid, next_tvb,
+  if (dissector_try_uint(osinl_subdissector_table, fr_nlpid, next_tvb,
 			 pinfo, tree) ||
-      dissector_try_port(fr_osinl_subdissector_table, fr_nlpid, next_tvb,
+      dissector_try_uint(fr_osinl_subdissector_table, fr_nlpid, next_tvb,
 			 pinfo, tree)) {
 	/*
 	 * Yes, we got a match.  Add the NLPID as a hidden item,
@@ -777,7 +777,7 @@ static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		proto_item_set_end(ti, tvb, offset);
 	}
 	next_tvb = tvb_new_subset_remaining(tvb,offset);
-	if (!dissector_try_port(fr_subdissector_table,fr_nlpid,
+	if (!dissector_try_uint(fr_subdissector_table,fr_nlpid,
 				next_tvb, pinfo, tree))
 		call_dissector(data_handle,next_tvb, pinfo, tree);
 	break;
@@ -937,11 +937,11 @@ void proto_reg_handoff_fr(void)
   dissector_handle_t fr_handle, fr_phdr_handle;
 
   fr_handle = find_dissector("fr");
-  dissector_add("gre.proto", ETHERTYPE_RAW_FR, fr_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, fr_handle);
+  dissector_add_uint("gre.proto", ETHERTYPE_RAW_FR, fr_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY, fr_handle);
 
   fr_phdr_handle = create_dissector_handle(dissect_fr_phdr, proto_fr);
-  dissector_add("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle);
 
   eth_withfcs_handle = find_dissector("eth_withfcs");
   gprs_ns_handle = find_dissector("gprs_ns");
diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c
index fb4425ebab..04c491f293 100644
--- a/epan/dissectors/packet-fractalgeneratorprotocol.c
+++ b/epan/dissectors/packet-fractalgeneratorprotocol.c
@@ -239,5 +239,5 @@ proto_reg_handoff_fractalgeneratorprotocol(void)
   dissector_handle_t fractalgeneratorprotocol_handle;
 
   fractalgeneratorprotocol_handle = new_create_dissector_handle(dissect_fractalgeneratorprotocol, proto_fractalgeneratorprotocol);
-  dissector_add("sctp.ppi", FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID, fractalgeneratorprotocol_handle);
+  dissector_add_uint("sctp.ppi", FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID, fractalgeneratorprotocol_handle);
 }
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index d6c520ca03..6d608cd274 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -346,7 +346,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 			if ((force_docsis_encap) && (docsis_handle)) {
 				call_dissector(docsis_handle, tvb, pinfo, parent_tree);
 			} else {
-				if (!dissector_try_port(wtap_encap_dissector_table, pinfo->fd->lnk_t,
+				if (!dissector_try_uint(wtap_encap_dissector_table, pinfo->fd->lnk_t,
 							tvb, pinfo, parent_tree)) {
 
 					col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 2994865d6e..1145dcb65e 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -330,7 +330,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	ftp_ip_address = pinfo->src;
 
-	if (pinfo->match_port == pinfo->destport)
+	if (pinfo->match_uint == pinfo->destport)
 		is_request = TRUE;
 	else
 		is_request = FALSE;
@@ -748,7 +748,7 @@ proto_reg_handoff_ftp(void)
   dissector_handle_t ftp_handle;
 
   ftpdata_handle = find_dissector("ftp-data");
-  dissector_add("tcp.port", TCP_PORT_FTPDATA, ftpdata_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_FTPDATA, ftpdata_handle);
   ftp_handle = find_dissector("ftp");
-  dissector_add("tcp.port", TCP_PORT_FTP, ftp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_FTP, ftp_handle);
 }
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index 73ab7de249..ea18378bbf 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -106,7 +106,7 @@ proto_reg_handoff_g723(void)
 	
 	g723_handle = create_dissector_handle(dissect_g723, proto_g723);
 
-	dissector_add("rtp.pt", PT_G723, g723_handle);
+	dissector_add_uint("rtp.pt", PT_G723, g723_handle);
 
 }
 
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index dd66b95296..3bea81948c 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -1841,5 +1841,5 @@ proto_reg_handoff_gdsdb(void)
 
 	gdsdb_handle = new_create_dissector_handle(dissect_gdsdb,
 								 proto_gdsdb);
-	dissector_add("tcp.port", TCP_PORT, gdsdb_handle);
+	dissector_add_uint("tcp.port", TCP_PORT, gdsdb_handle);
 }
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c
index 4fc1f06839..da497fb678 100644
--- a/epan/dissectors/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
@@ -60,7 +60,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "giFT");
 
 	/* determine whether it is a request to or response from the server */
-	if (pinfo->match_port == pinfo->destport)
+	if (pinfo->match_uint == pinfo->destport)
 		is_request = TRUE;
 	else
 		is_request = FALSE;
@@ -150,5 +150,5 @@ proto_reg_handoff_gift(void)
 	dissector_handle_t gift_handle;
 
 	gift_handle = create_dissector_handle(dissect_gift, proto_gift);
-	dissector_add("tcp.port", TCP_PORT_GIFT, gift_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_GIFT, gift_handle);
 }
diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index 8f6a704106..1896157c7a 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -161,5 +161,5 @@ proto_reg_handoff_git(void)
   dissector_handle_t git_handle;
 
   git_handle = find_dissector("git");
-  dissector_add("tcp.port", TCP_PORT_GIT, git_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_GIT, git_handle);
 }
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index b635ab8767..cd065831cd 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -582,5 +582,5 @@ proto_reg_handoff_glbp(void)
   dissector_handle_t glbp_handle;
 
   glbp_handle = new_create_dissector_handle(dissect_glbp_static, proto_glbp);
-  dissector_add("udp.port", 3222, glbp_handle);
+  dissector_add_uint("udp.port", 3222, glbp_handle);
 }
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 5a1d6a2d94..c46d743030 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -318,7 +318,7 @@ proto_reg_handoff_gmhdr(void)
   dissector_handle_t gmhdr_handle;
 
   gmhdr_handle = create_dissector_handle(dissect_gmhdr, proto_gmhdr);
-  dissector_add("ethertype", ETHERTYPE_GIGAMON, gmhdr_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_GIGAMON, gmhdr_handle);
   heur_dissector_add("eth.trailer", dissect_gmtrailer, proto_gmhdr);
 }
 
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index f3c8d7bd87..76b416e2b4 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -750,5 +750,5 @@ void proto_reg_handoff_gnutella(void) {
 
 	gnutella_handle = create_dissector_handle(dissect_gnutella,
 			proto_gnutella);
-	dissector_add("tcp.port", GNUTELLA_TCP_PORT, gnutella_handle);
+	dissector_add_uint("tcp.port", GNUTELLA_TCP_PORT, gnutella_handle);
 }
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index 0771fd3799..f94b8009fa 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -1036,5 +1036,5 @@ void proto_reg_handoff_goose(void) {
 	dissector_handle_t goose_handle;
 	goose_handle = find_dissector("goose");
 	
-	dissector_add("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
 }
diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c
index ee889a495d..465cc2cd71 100644
--- a/epan/dissectors/packet-gopher.c
+++ b/epan/dissectors/packet-gopher.c
@@ -208,12 +208,12 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 /* Preference callbacks */
 static void
 range_delete_gopher_tcp_callback(guint32 port) {
-      dissector_delete("tcp.port", port, gopher_handle);
+      dissector_delete_uint("tcp.port", port, gopher_handle);
 }
 
 static void
 range_add_gopher_tcp_callback(guint32 port) {
-    dissector_add("tcp.port", port, gopher_handle);
+    dissector_add_uint("tcp.port", port, gopher_handle);
 }
 
 static void
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index 6f6c5142f3..542ea350ca 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -774,7 +774,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			{
 				/* otherwise - call a subdissector */
 				next_tvb = tvb_new_subset(tvb, offset, (llc_data_length-offset), -1);
-   				if (!dissector_try_port(llcgprs_subdissector_table,sapi, next_tvb, pinfo, tree))
+   				if (!dissector_try_uint(llcgprs_subdissector_table,sapi, next_tvb, pinfo, tree))
 				/* if no subdissector is found, call the data dissector */
 				{
 	   				call_dissector(data_handle, next_tvb, pinfo, tree);
@@ -906,7 +906,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			{
 				/* otherwise - call a subdissector */
 				next_tvb = tvb_new_subset(tvb, offset, (llc_data_length-offset), -1 );
-				if (!dissector_try_port(llcgprs_subdissector_table,sapi, next_tvb, pinfo, tree))
+				if (!dissector_try_uint(llcgprs_subdissector_table,sapi, next_tvb, pinfo, tree))
 				{
 					call_dissector(data_handle, next_tvb, pinfo, tree);
 				}
@@ -1015,7 +1015,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				else if (llc_data_length>offset)
 				{
 					/* otherwise - call a subdissector */
-					if (!dissector_try_port(llcgprs_subdissector_table, sapi, next_tvb, pinfo, tree))
+					if (!dissector_try_uint(llcgprs_subdissector_table, sapi, next_tvb, pinfo, tree))
 					{
 						call_dissector(data_handle, next_tvb, pinfo, tree);
 					}
@@ -1312,7 +1312,7 @@ proto_reg_handoff_llcgprs(void)
 
 	/* make sure that the top level can call this dissector */
 	gprs_llc_handle = find_dissector("llcgprs");
-	dissector_add("wtap_encap", WTAP_ENCAP_GPRS_LLC, gprs_llc_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_GPRS_LLC, gprs_llc_handle);
 
 	data_handle = find_dissector("data");
 	sndcp_xid_handle  = find_dissector("sndcpxid");
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index ae48a0904e..679c17d17f 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -489,7 +489,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         return;	/* no payload */
     }
     next_tvb = tvb_new_subset_remaining(tvb, offset);
-    if (!dissector_try_port(gre_dissector_table, type, next_tvb, pinfo, tree))
+    if (!dissector_try_uint(gre_dissector_table, type, next_tvb, pinfo, tree))
       call_dissector(data_handle,next_tvb, pinfo, gre_tree);
   }
 }
@@ -679,6 +679,6 @@ proto_reg_handoff_gre(void)
 	dissector_handle_t gre_handle;
 
 	gre_handle = create_dissector_handle(dissect_gre, proto_gre);
-	dissector_add("ip.proto", IP_PROTO_GRE, gre_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_GRE, gre_handle);
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 2d6e83acea..5b9a8fe019 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -6864,7 +6864,7 @@ proto_reg_handoff_gsm_a_bssmap(void)
     dissector_handle_t bssmap_handle;
 
     bssmap_handle = find_dissector("gsm_a_bssmap");
-    dissector_add("bssap.pdu_type",  BSSAP_PDU_TYPE_BSSMAP, bssmap_handle);
+    dissector_add_uint("bssap.pdu_type",  BSSAP_PDU_TYPE_BSSMAP, bssmap_handle);
 
     dtap_handle = find_dissector("gsm_a_dtap");
     gsm_bsslap_handle = find_dissector("gsm_bsslap");
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index ac4f9596aa..9122197c9a 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -6785,12 +6785,12 @@ proto_reg_handoff_gsm_a_dtap(void)
 	dissector_handle_t dtap_handle;
 
 	dtap_handle = find_dissector("gsm_a_dtap");
-	dissector_add("bssap.pdu_type", BSSAP_PDU_TYPE_DTAP, dtap_handle);
-	dissector_add("ranap.nas_pdu", BSSAP_PDU_TYPE_DTAP, dtap_handle);
-	dissector_add("llcgprs.sapi", 1 , dtap_handle); /* GPRS Mobility Management */
-	dissector_add("llcgprs.sapi", 7 , dtap_handle); /* SMS */
-	dissector_add("lapdm.sapi", 0 , dtap_handle); /* LAPDm: CC/RR/MM */
-	dissector_add("lapdm.sapi", 3 , dtap_handle); /* LAPDm: SMS/SS */
+	dissector_add_uint("bssap.pdu_type", BSSAP_PDU_TYPE_DTAP, dtap_handle);
+	dissector_add_uint("ranap.nas_pdu", BSSAP_PDU_TYPE_DTAP, dtap_handle);
+	dissector_add_uint("llcgprs.sapi", 1 , dtap_handle); /* GPRS Mobility Management */
+	dissector_add_uint("llcgprs.sapi", 7 , dtap_handle); /* SMS */
+	dissector_add_uint("lapdm.sapi", 0 , dtap_handle); /* LAPDm: CC/RR/MM */
+	dissector_add_uint("lapdm.sapi", 3 , dtap_handle); /* LAPDm: SMS/SS */
 
 	data_handle = find_dissector("data");
 	gsm_map_handle = find_dissector("gsm_map");
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 8a47b9fee2..fe4a9d0b25 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -3217,7 +3217,7 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
 				break;
 			default:
 			{
-				handle = dissector_get_port_handle ( gprs_sm_pco_subdissector_table , prot );
+				handle = dissector_get_uint_handle ( gprs_sm_pco_subdissector_table , prot );
 				if ( handle != NULL )
 				{
 					proto_tree_add_text(tree,tvb, curr_offset-3, 2, "Protocol: %s (%u)" ,
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index 7e7ad220cd..4d2c23da79 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -161,7 +161,7 @@ de_rp_user_data(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha
 	 */
 	tpdu_tvb = tvb_new_subset(tvb, curr_offset, len, len);
 
-	dissector_try_port(sms_dissector_table, 0, tpdu_tvb, g_pinfo, g_tree);
+	dissector_try_uint(sms_dissector_table, 0, tpdu_tvb, g_pinfo, g_tree);
 
 	curr_offset += len;
 
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 89da14659e..b4ecf418fd 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -1100,7 +1100,7 @@ proto_reg_handoff_gsm_bssmap_le(void)
 
 	bssmap_le_handle = find_dissector("gsm_bssmap_le");
 
-	dissector_add("bssap.pdu_type",  BSSAP_PDU_TYPE_BSSMAP, bssmap_le_handle);
+	dissector_add_uint("bssap.pdu_type",  BSSAP_PDU_TYPE_BSSMAP, bssmap_le_handle);
 
 	gsm_bsslap_handle = find_dissector("gsm_bsslap");
 }
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index 3e11dad8df..7091cd19dc 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -355,25 +355,25 @@ void proto_register_ipa(void)
 static void ipa_tcp_delete_callback(guint32 port)
 {
 	if (port)
-		dissector_delete("tcp.port", port, ipa_handle);
+		dissector_delete_uint("tcp.port", port, ipa_handle);
 }
 
 static void ipa_udp_delete_callback(guint32 port)
 {
 	if (port)
-		dissector_delete("udp.port", port, ipa_handle);
+		dissector_delete_uint("udp.port", port, ipa_handle);
 }
 
 static void ipa_tcp_add_callback(guint32 port)
 {
 	if (port)
-		dissector_add("tcp.port", port, ipa_handle);
+		dissector_add_uint("tcp.port", port, ipa_handle);
 }
 
 static void ipa_udp_add_callback(guint32 port)
 {
 	if (port)
-		dissector_add("udp.port", port, ipa_handle);
+		dissector_add_uint("udp.port", port, ipa_handle);
 }
 
 void proto_reg_handoff_gsm_ipa(void)
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index f53b04234a..de0e19385e 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -4824,7 +4824,7 @@ dissect_gsm_map_er_SM_DeliveryFailureCause(gboolean implicit_tag _U_, tvbuff_t *
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -5778,7 +5778,7 @@ dissect_gsm_map_sm_MO_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -5803,7 +5803,7 @@ dissect_gsm_map_sm_MO_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -5831,7 +5831,7 @@ dissect_gsm_map_sm_MT_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -5856,7 +5856,7 @@ dissect_gsm_map_sm_MT_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -6039,7 +6039,7 @@ dissect_gsm_map_sm_MT_ForwardSM_VGCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tv
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -6079,7 +6079,7 @@ dissect_gsm_map_sm_MT_ForwardSM_VGCS_Res(gboolean implicit_tag _U_, tvbuff_t *tv
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
@@ -15982,7 +15982,7 @@ dissect_gsm_old_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 	if (!actx->value_ptr)
 		return offset;
-	dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+	dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 
 
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 850c84a524..e637aa2092 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -2710,9 +2710,9 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb
 	{
 	    /*proto_tree_add_text(subtree, tvb , offset , length, "%s",
 	      tvb_format_text(tvb, offset, length));				*/
-	    if (! dissector_try_port(gsm_sms_dissector_tbl, g_port_src, sm_tvb, g_pinfo, subtree))
+	    if (! dissector_try_uint(gsm_sms_dissector_tbl, g_port_src, sm_tvb, g_pinfo, subtree))
 	    {
-		if (! dissector_try_port(gsm_sms_dissector_tbl, g_port_dst,sm_tvb, g_pinfo, subtree))
+		if (! dissector_try_uint(gsm_sms_dissector_tbl, g_port_dst,sm_tvb, g_pinfo, subtree))
 		{
 		    if (subtree)
 		    { /* Only display if needed */
@@ -3767,6 +3767,6 @@ proto_reg_handoff_gsm_sms(void)
 
     gsm_sms_handle = create_dissector_handle(dissect_gsm_sms, proto_gsm_sms);
 
-    dissector_add("gsm_a.sms_tpdu", 0, gsm_sms_handle);
-    dissector_add("gsm_map.sms_tpdu", 0, gsm_sms_handle);
+    dissector_add_uint("gsm_a.sms_tpdu", 0, gsm_sms_handle);
+    dissector_add_uint("gsm_map.sms_tpdu", 0, gsm_sms_handle);
 }
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index fa909cfe13..01ba64f963 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -394,9 +394,9 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo,
 				if ( port_number_udh_means_wsp ) {
 					call_dissector (wsp_handle, sm_tvb, pinfo, top_tree);
 				} else {
-					if (! dissector_try_port(gsm_sms_dissector_table, p_src,
+					if (! dissector_try_uint(gsm_sms_dissector_table, p_src,
 								sm_tvb, pinfo, top_tree)) {
-						if (! dissector_try_port(gsm_sms_dissector_table, p_dst,
+						if (! dissector_try_uint(gsm_sms_dissector_table, p_dst,
 									sm_tvb, pinfo, top_tree)) {
 							if (sm_tree) { /* Only display if needed */
 								proto_tree_add_text (sm_tree, sm_tvb, 0, -1,
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c
index 59aabcd0d0..87bef0dcb7 100644
--- a/epan/dissectors/packet-gsm_um.c
+++ b/epan/dissectors/packet-gsm_um.c
@@ -293,6 +293,6 @@ proto_reg_handoff_gsm_um(void)
 
 	gsm_um_handle = create_dissector_handle(dissect_gsm_um, proto_gsm_um);
 
-	dissector_add("wtap_encap", WTAP_ENCAP_GSM_UM, gsm_um_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_GSM_UM, gsm_um_handle);
 }
 
diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c
index 91d0e7b591..a2f8f3149d 100644
--- a/epan/dissectors/packet-gsmtap.c
+++ b/epan/dissectors/packet-gsmtap.c
@@ -394,5 +394,5 @@ proto_reg_handoff_gsmtap(void)
 	sub_handles[GSMTAP_SUB_UM_LAPDM] = find_dissector("lapdm");
 	sub_handles[GSMTAP_SUB_ABIS] = find_dissector("gsm_a_dtap");
 	gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap);
-	dissector_add("udp.port", GSMTAP_UDP_PORT, gsmtap_handle);
+	dissector_add_uint("udp.port", GSMTAP_UDP_PORT, gsmtap_handle);
 }
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index e6872b9b68..05511cc3a3 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -3802,7 +3802,7 @@ static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _
     if (con_len > 0) {
 
         l3_tvb = tvb_new_subset(tvb, offset, con_len, con_len);
-        if (!dissector_try_port(bssap_pdu_type_table, BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, ext_tree_mm))
+        if (!dissector_try_uint(bssap_pdu_type_table, BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, ext_tree_mm))
             call_dissector(data_handle, l3_tvb, pinfo, ext_tree_mm);
     }
 
@@ -4468,7 +4468,7 @@ int decode_gtp_proto_conf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto
              * data as, for example, IP?
              */
             next_tvb = tvb_new_subset(tvb, offset + 3, proto_len, proto_len);
-            if (!dissector_try_port(ppp_subdissector_table, proto_id, next_tvb, pinfo, ext_tree_proto)) {
+            if (!dissector_try_uint(ppp_subdissector_table, proto_id, next_tvb, pinfo, ext_tree_proto)) {
                 call_dissector(data_handle, next_tvb, pinfo, ext_tree_proto);
             }
 
@@ -7236,22 +7236,22 @@ void proto_reg_handoff_gtp(void)
         gtpv2_handle = find_dissector("gtpv2");
         bssap_pdu_type_table = find_dissector_table("bssap.pdu_type");
         /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */
-        dissector_add("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp));
+        dissector_add_uint("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp));
         /* AVP Code: 904 MBMS-Session-Duration */
-        dissector_add("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp));
+        dissector_add_uint("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp));
         /* AVP Code: 911 MBMS-Time-To-Data-Transfer */
-        dissector_add("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp));
+        dissector_add_uint("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp));
 
         Initialized = TRUE;
     } else {
-        dissector_delete("udp.port", gtpv0_port, gtp_prim_handle);
-        dissector_delete("udp.port", gtpv1c_port, gtp_handle);
-        dissector_delete("udp.port", gtpv1u_port, gtp_handle);
+        dissector_delete_uint("udp.port", gtpv0_port, gtp_prim_handle);
+        dissector_delete_uint("udp.port", gtpv1c_port, gtp_handle);
+        dissector_delete_uint("udp.port", gtpv1u_port, gtp_handle);
 
         if (gtp_over_tcp) {
-            dissector_delete("tcp.port", gtpv0_port, gtp_prim_handle);
-            dissector_delete("tcp.port", gtpv1c_port, gtp_handle);
-            dissector_delete("tcp.port", gtpv1u_port, gtp_handle);
+            dissector_delete_uint("tcp.port", gtpv0_port, gtp_prim_handle);
+            dissector_delete_uint("tcp.port", gtpv1c_port, gtp_handle);
+            dissector_delete_uint("tcp.port", gtpv1u_port, gtp_handle);
         }
     }
 
@@ -7260,14 +7260,14 @@ void proto_reg_handoff_gtp(void)
     gtpv1c_port  = g_gtpv1c_port;
     gtpv1u_port  = g_gtpv1u_port;
 
-    dissector_add("udp.port", g_gtpv0_port, gtp_prim_handle);
-    dissector_add("udp.port", g_gtpv1c_port, gtp_handle);
-    dissector_add("udp.port", g_gtpv1u_port, gtp_handle);
+    dissector_add_uint("udp.port", g_gtpv0_port, gtp_prim_handle);
+    dissector_add_uint("udp.port", g_gtpv1c_port, gtp_handle);
+    dissector_add_uint("udp.port", g_gtpv1u_port, gtp_handle);
 
     if (g_gtp_over_tcp) {
-        dissector_add("tcp.port", g_gtpv0_port, gtp_prim_handle);
-        dissector_add("tcp.port", g_gtpv1c_port, gtp_handle);
-        dissector_add("tcp.port", g_gtpv1u_port, gtp_handle);
+        dissector_add_uint("tcp.port", g_gtpv0_port, gtp_prim_handle);
+        dissector_add_uint("tcp.port", g_gtpv1c_port, gtp_handle);
+        dissector_add_uint("tcp.port", g_gtpv1u_port, gtp_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index c5eb15a8a4..6098f98a9e 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -2209,7 +2209,7 @@ void proto_register_gtpv2(void)
     proto_register_field_array(proto_gtpv2, hf_gtpv2, array_length(hf_gtpv2));
     proto_register_subtree_array(ett_gtpv2_array, array_length(ett_gtpv2_array));
     /* AVP Code: 22 3GPP-User-Location-Info */
-    dissector_add("diameter.3gpp", 22, new_create_dissector_handle(dissect_diameter_3gpp_uli, proto_gtpv2));
+    dissector_add_uint("diameter.3gpp", 22, new_create_dissector_handle(dissect_diameter_3gpp_uli, proto_gtpv2));
 
     register_dissector("gtpv2", dissect_gtpv2, proto_gtpv2);
 }
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 441c32ab16..cbd43c77dc 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -460,6 +460,6 @@ proto_reg_handoff_gvcp(void)
   dissector_handle_t gvcp_handle;
 
   gvcp_handle = new_create_dissector_handle(dissect_gvcp, proto_gvcp);
-  dissector_add("udp.port", GVCP_PORT, gvcp_handle);
+  dissector_add_uint("udp.port", GVCP_PORT, gvcp_handle);
 }
 
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index ae4e7ef062..373f3f0297 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -134,7 +134,7 @@ proto_reg_handoff_nonstd(void)
   ms_nonstd_handle = create_dissector_handle(dissect_ms_nonstd, proto_nonstd);
 
 
-  dissector_add("h245.nsp.h221",0xb500534c, ms_nonstd_handle);
-  dissector_add("h225.nsp.h221",0xb500534c, ms_nonstd_handle);
+  dissector_add_uint("h245.nsp.h221",0xb500534c, ms_nonstd_handle);
+  dissector_add_uint("h225.nsp.h221",0xb500534c, ms_nonstd_handle);
 
 }
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 8d15837a8f..006769d2c2 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1613,7 +1613,7 @@ void proto_reg_handoff_h223(void)
     dissector_add_handle("tcp.port", h223);
     dissector_add_handle("tcp.port", h223_bitswapped);
     dissector_add_string("rtp_dyn_payload_type","CLEARMODE", h223_bitswapped);
-    dissector_add("iax2.dataformat", AST_DATAFORMAT_H223_H245, h223_bitswapped);
+    dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_H223_H245, h223_bitswapped);
 }
 
 /*
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 64cd197228..2530fdf1cc 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1471,7 +1471,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
 			break;
 		case 1 :  /* h221NonStandard */
-			nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+			nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
 			break;
 		default :
 			nsp_handle = NULL;
@@ -11009,8 +11009,8 @@ proto_reg_handoff_h225(void)
 
 	if (!h225_prefs_initialized) {
 		h225ras_handle=find_dissector("h225.ras");
-		dissector_add("udp.port", UDP_PORT_RAS1, h225ras_handle);
-		dissector_add("udp.port", UDP_PORT_RAS2, h225ras_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RAS1, h225ras_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RAS2, h225ras_handle);
 
 		h245_handle = find_dissector("h245");
 		h245dg_handle = find_dissector("h245dg");
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index a071e46ef5..ec41a63302 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -2553,7 +2553,7 @@ dissect_h245_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 			nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
 			break;
 		case 1 :  /* h221NonStandard */
-			nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+			nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
 			break;
 		default :
 			nsp_handle = NULL;
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 9329a91e27..44c1b99da0 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -6969,26 +6969,26 @@ void proto_reg_handoff_h248(void) {
     if (!initialized) {
         h248_handle = find_dissector("h248");
         h248_tpkt_handle = find_dissector("h248.tpkt");
-        dissector_add("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
+        dissector_add_uint("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
         h248_term_handle = find_dissector("h248term");
         initialized = TRUE;
     } else {
         if (udp_port != 0)
-            dissector_delete("udp.port", udp_port, h248_handle);
+            dissector_delete_uint("udp.port", udp_port, h248_handle);
 
         if (tcp_port != 0)
-            dissector_delete("tcp.port", tcp_port, h248_tpkt_handle);
+            dissector_delete_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 
     udp_port = global_udp_port;
     tcp_port = global_tcp_port;
 
     if (udp_port != 0) {
-        dissector_add("udp.port", udp_port, h248_handle);
+        dissector_add_uint("udp.port", udp_port, h248_handle);
     }
 
     if (tcp_port != 0) {
-        dissector_add("tcp.port", tcp_port, h248_tpkt_handle);
+        dissector_add_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index a3f59f1710..90c2990800 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -253,6 +253,6 @@ proto_reg_handoff_h261(void)
 	dissector_handle_t h261_handle;
 
 	h261_handle = create_dissector_handle(dissect_h261, proto_h261);
-	dissector_add("rtp.pt", PT_H261, h261_handle);
-	dissector_add("iax2.codec", AST_FORMAT_H261, h261_handle);
+	dissector_add_uint("rtp.pt", PT_H261, h261_handle);
+	dissector_add_uint("iax2.codec", AST_FORMAT_H261, h261_handle);
 }
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index 7331f57d1a..0ee9424677 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -215,12 +215,12 @@ proto_reg_handoff_h263P(void)
 	  }
 	else {
 		if ( dynamic_payload_type > 95 )
-			dissector_delete("rtp.pt", dynamic_payload_type, h263P_handle);
+			dissector_delete_uint("rtp.pt", dynamic_payload_type, h263P_handle);
 	}
 	dynamic_payload_type = temp_dynamic_payload_type;
 
 	if ( dynamic_payload_type > 95 ){
-		dissector_add("rtp.pt", dynamic_payload_type, h263P_handle);
+		dissector_add_uint("rtp.pt", dynamic_payload_type, h263P_handle);
 	}
 }
 
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index eb946cd1c8..16c0d55ec1 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -2060,12 +2060,12 @@ dissect_h264_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree)
 
 static void range_delete_h264_rtp_pt_callback(guint32 rtp_pt) {
   if (rtp_pt >= 96 && rtp_pt <= 127)
-     dissector_delete("rtp.pt", rtp_pt, h264_handle);
+     dissector_delete_uint("rtp.pt", rtp_pt, h264_handle);
 }
 
 static void range_add_h264_rtp_pt_callback(guint32 rtp_pt) {
   if (rtp_pt >= 96 && rtp_pt <= 127)
-     dissector_add("rtp.pt", rtp_pt, h264_handle);
+     dissector_add_uint("rtp.pt", rtp_pt, h264_handle);
 }
 
 
diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index 30114eeb57..294f05ad5a 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -216,7 +216,7 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
   actx->rose_ctx->d.pdu = 1;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) {
-    arg_handle = dissector_get_port_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
+    arg_handle = dissector_get_uint_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->arg_global_dissector_table) {
     arg_handle = dissector_get_string_handle(actx->rose_ctx->arg_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
@@ -299,7 +299,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
   actx->rose_ctx->d.pdu = 2;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) {
-    res_handle = dissector_get_port_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
+    res_handle = dissector_get_uint_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->res_global_dissector_table) {
     res_handle = dissector_get_string_handle(actx->rose_ctx->res_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
@@ -369,7 +369,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
   actx->rose_ctx->d.pdu = 3;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) {
-    err_handle = dissector_get_port_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
+    err_handle = dissector_get_uint_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->err_global_dissector_table) {
     err_handle = dissector_get_string_handle(actx->rose_ctx->err_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index e7c83367e6..d676c50839 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -6491,12 +6491,12 @@ proto_reg_handoff_h450(void)
   h450_arg_handle = new_create_dissector_handle(dissect_h450_arg, proto_h450);
   h450_res_handle = new_create_dissector_handle(dissect_h450_res, proto_h450);
   for (i=0; i<(int)array_length(h450_op_tab); i++) {
-    dissector_add("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
-    dissector_add("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
+    dissector_add_uint("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
+    dissector_add_uint("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
   }
   h450_err_handle = new_create_dissector_handle(dissect_h450_err, proto_h450);
   for (i=0; i<(int)array_length(h450_err_tab); i++) {
-    dissector_add("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
+    dissector_add_uint("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
   }
 
 }
diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index f5392f9f04..beccf13160 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -3711,15 +3711,15 @@ void proto_reg_handoff_h501(void)
     h501_tcp_handle = new_create_dissector_handle(dissect_h501_tcp, proto_h501);
     h501_prefs_initialized = TRUE;
   } else {
-    dissector_delete("udp.port", saved_h501_udp_port, h501_udp_handle);
-    dissector_delete("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+    dissector_delete_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
+    dissector_delete_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
   }
 
   /* Set our port number for future use */
   saved_h501_udp_port = h501_udp_port;
-  dissector_add("udp.port", saved_h501_udp_port, h501_udp_handle);
+  dissector_add_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
   saved_h501_tcp_port = h501_tcp_port;
-  dissector_add("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+  dissector_add_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c
index 6fa98c6b09..a8e2d03062 100644
--- a/epan/dissectors/packet-hci_h1.c
+++ b/epan/dissectors/packet-hci_h1.c
@@ -105,7 +105,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	PROTO_ITEM_SET_GENERATED(ti);
 
 	next_tvb = tvb_new_subset_remaining(tvb, 0);
-	if(!dissector_try_port(hci_h1_table, type, next_tvb, pinfo, tree)) {
+	if(!dissector_try_uint(hci_h1_table, type, next_tvb, pinfo, tree)) {
 		call_dissector(data_handle, next_tvb, pinfo, tree);
 	}
 }
@@ -150,7 +150,7 @@ proto_reg_handoff_hci_h1(void)
 
 	data_handle = find_dissector("data");
 	hci_h1_handle = find_dissector("hci_h1");
-	dissector_add("wtap_encap", WTAP_ENCAP_BLUETOOTH_HCI, hci_h1_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_HCI, hci_h1_handle);
 }
 
 
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index 96cad74b4a..f71ea67fe1 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -85,7 +85,7 @@ dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		tvb, 0, 1, TRUE);
 
 	next_tvb = tvb_new_subset_remaining(tvb, 1);
-	if(!dissector_try_port(hci_h4_table, type, next_tvb, pinfo, tree)) {
+	if(!dissector_try_uint(hci_h4_table, type, next_tvb, pinfo, tree)) {
 		col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
 						pinfo->p2p_dir==P2P_DIR_SENT ? "Sent" : "Rcvd",
 						val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x"));
@@ -134,8 +134,8 @@ proto_reg_handoff_hci_h4(void)
 
 	data_handle = find_dissector("data");
 	hci_h4_handle = find_dissector("hci_h4");
-	dissector_add("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4, hci_h4_handle);
-	dissector_add("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, hci_h4_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4, hci_h4_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, hci_h4_handle);
 }
 
 
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c
index 4d16651df3..3fbcb9bdce 100644
--- a/epan/dissectors/packet-hip.c
+++ b/epan/dissectors/packet-hip.c
@@ -1532,8 +1532,8 @@ proto_reg_handoff_hip(void)
         dissector_handle_t hip_handle2;
 
         hip_handle = create_dissector_handle(dissect_hip, proto_hip);
-        dissector_add("ip.proto", IP_PROTO_HIP, hip_handle);
+        dissector_add_uint("ip.proto", IP_PROTO_HIP, hip_handle);
 
         hip_handle2 = create_dissector_handle(dissect_hip_in_udp, proto_hip);
-        dissector_add("udp.port", 10500, hip_handle2);
+        dissector_add_uint("udp.port", 10500, hip_handle2);
 }
diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c
index 104fc8f054..418f23d6d7 100644
--- a/epan/dissectors/packet-hnbap.c
+++ b/epan/dissectors/packet-hnbap.c
@@ -1986,12 +1986,12 @@ static void dissect_HNBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 #if 0
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -2015,17 +2015,17 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -2555,52 +2555,52 @@ proto_reg_handoff_hnbap(void)
 
         if (!initialized) {
                 hnbap_handle = find_dissector("hnbap");
-                dissector_add("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
+                dissector_add_uint("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
                 initialized = TRUE;
 
 /*--- Included file: packet-hnbap-dis-tab.c ---*/
 #line 1 "packet-hnbap-dis-tab.c"
-  dissector_add("hnbap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_HNB_Identity, new_create_dissector_handle(dissect_HNB_Identity_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_Context_ID, new_create_dissector_handle(dissect_Context_ID_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_UE_Identity, new_create_dissector_handle(dissect_UE_Identity_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_LAC, new_create_dissector_handle(dissect_LAC_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_HNB_Location_Information, new_create_dissector_handle(dissect_HNB_Location_Information_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_PLMNidentity, new_create_dissector_handle(dissect_PLMNidentity_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_SAC, new_create_dissector_handle(dissect_SAC_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_CellIdentity, new_create_dissector_handle(dissect_CellIdentity_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_Registration_Cause, new_create_dissector_handle(dissect_Registration_Cause_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_UE_Capabilities, new_create_dissector_handle(dissect_UE_Capabilities_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_RNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_CSG_ID, new_create_dissector_handle(dissect_CSG_ID_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_BackoffTimer, new_create_dissector_handle(dissect_BackoffTimer_PDU, proto_hnbap));
-  dissector_add("hnbap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
-  dissector_add("hnbap.extension", id_HNB_Internet_Information, new_create_dissector_handle(dissect_IP_Address_PDU, proto_hnbap));
-  dissector_add("hnbap.extension", id_HNB_Cell_Access_Mode, new_create_dissector_handle(dissect_HNB_Cell_Access_Mode_PDU, proto_hnbap));
-  dissector_add("hnbap.extension", id_MuxPortNumber, new_create_dissector_handle(dissect_MuxPortNumber_PDU, proto_hnbap));
-  dissector_add("hnbap.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterRequest_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.sout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterAccept_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.uout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterReject_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_UERegister, new_create_dissector_handle(dissect_UERegisterRequest_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.sout", id_UERegister, new_create_dissector_handle(dissect_UERegisterAccept_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.uout", id_UERegister, new_create_dissector_handle(dissect_UERegisterReject_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_UEDe_Register, new_create_dissector_handle(dissect_UEDe_Register_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_HNBDe_Register, new_create_dissector_handle(dissect_HNBDe_Register_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_CSGMembershipUpdate, new_create_dissector_handle(dissect_CSGMembershipUpdate_PDU, proto_hnbap));
-  dissector_add("hnbap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_HNB_Identity, new_create_dissector_handle(dissect_HNB_Identity_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_Context_ID, new_create_dissector_handle(dissect_Context_ID_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_UE_Identity, new_create_dissector_handle(dissect_UE_Identity_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_LAC, new_create_dissector_handle(dissect_LAC_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_HNB_Location_Information, new_create_dissector_handle(dissect_HNB_Location_Information_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_PLMNidentity, new_create_dissector_handle(dissect_PLMNidentity_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_SAC, new_create_dissector_handle(dissect_SAC_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_CellIdentity, new_create_dissector_handle(dissect_CellIdentity_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_Registration_Cause, new_create_dissector_handle(dissect_Registration_Cause_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_UE_Capabilities, new_create_dissector_handle(dissect_UE_Capabilities_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_RNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_CSG_ID, new_create_dissector_handle(dissect_CSG_ID_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_BackoffTimer, new_create_dissector_handle(dissect_BackoffTimer_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.extension", id_HNB_Internet_Information, new_create_dissector_handle(dissect_IP_Address_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.extension", id_HNB_Cell_Access_Mode, new_create_dissector_handle(dissect_HNB_Cell_Access_Mode_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.extension", id_MuxPortNumber, new_create_dissector_handle(dissect_MuxPortNumber_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterRequest_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.sout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterAccept_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.uout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterReject_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_UERegister, new_create_dissector_handle(dissect_UERegisterRequest_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.sout", id_UERegister, new_create_dissector_handle(dissect_UERegisterAccept_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.uout", id_UERegister, new_create_dissector_handle(dissect_UERegisterReject_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_UEDe_Register, new_create_dissector_handle(dissect_UEDe_Register_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_HNBDe_Register, new_create_dissector_handle(dissect_HNBDe_Register_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_CSGMembershipUpdate, new_create_dissector_handle(dissect_CSGMembershipUpdate_PDU, proto_hnbap));
+  dissector_add_uint("hnbap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_hnbap));
 
 
 /*--- End of included file: packet-hnbap-dis-tab.c ---*/
 #line 198 "packet-hnbap-template.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, hnbap_handle);
+                dissector_delete_uint("sctp.port", sctp_port, hnbap_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, hnbap_handle);
+        dissector_add_uint("sctp.port", sctp_port, hnbap_handle);
 }
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index 452b37eca7..e4997d9481 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -1353,7 +1353,7 @@ proto_reg_handoff_homeplug(void)
   dissector_handle_t homeplug_handle;
 
   homeplug_handle = create_dissector_handle(dissect_homeplug, proto_homeplug);
-  dissector_add("ethertype", ETHERTYPE_HOMEPLUG, homeplug_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_HOMEPLUG, homeplug_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c
index 92bc92eb9a..8830e2daf4 100644
--- a/epan/dissectors/packet-hp-erm.c
+++ b/epan/dissectors/packet-hp-erm.c
@@ -123,12 +123,12 @@ proto_reg_handoff_hp_erm(void)
         initialized = TRUE;
     } else {
         if (hp_erm_udp_port != 0)
-            dissector_delete("udp.port", hp_erm_udp_port, hp_erm_handle);
+            dissector_delete_uint("udp.port", hp_erm_udp_port, hp_erm_handle);
     }
 
     hp_erm_udp_port = global_hp_erm_udp_port;
 
     if (hp_erm_udp_port != 0)
-        dissector_add("udp.port", hp_erm_udp_port, hp_erm_handle);
+        dissector_add_uint("udp.port", hp_erm_udp_port, hp_erm_handle);
 }
 
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 1a3042df54..56731b38b2 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -84,7 +84,7 @@ dissect_hpext(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if (tvb_length_remaining(tvb, 7) > 0) {
 		next_tvb = tvb_new_subset_remaining(tvb, 7);
-		if (!dissector_try_port(subdissector_table,
+		if (!dissector_try_uint(subdissector_table,
 		    dxsap, next_tvb, pinfo, tree)) {
 			call_dissector(data_handle, next_tvb, pinfo, tree);
 		}
@@ -127,5 +127,5 @@ proto_reg_handoff_hpext(void)
 	data_handle = find_dissector("data");
 
 	hpext_handle = find_dissector("hpext");
-	dissector_add("llc.dsap", SAP_HPEXT, hpext_handle);
+	dissector_add_uint("llc.dsap", SAP_HPEXT, hpext_handle);
 }
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index 7e430687b9..a6e3e7d339 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -301,5 +301,5 @@ proto_reg_handoff_hpsw(void)
 
 	hpsw_handle = find_dissector("hpsw");
 
-	dissector_add("hpext.dxsap", HPEXT_HPSW, hpsw_handle);
+	dissector_add_uint("hpext.dxsap", HPEXT_HPSW, hpsw_handle);
 }
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index 1f2d19ab05..73ae24f13e 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -121,5 +121,5 @@ void proto_reg_handoff_hpteam(void)
 	data_handle   = find_dissector("data");
 	hpteam_handle = find_dissector("hpteam");
 	/* Register dissector to key off of known PID / OUI combination */
-	dissector_add("llc.hpteam_pid", 0x0002, hpteam_handle);
+	dissector_add_uint("llc.hpteam_pid", 0x0002, hpteam_handle);
 }
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index 7947d61048..484173270a 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -832,6 +832,6 @@ proto_reg_handoff_hsrp(void)
 
 	data_handle = find_dissector("data");
 	hsrp_handle = new_create_dissector_handle(dissect_hsrp, proto_hsrp);
-	dissector_add("udp.port", UDP_PORT_HSRP, hsrp_handle);
-	dissector_add("udp.port", UDP_PORT_HSRP2_V6, hsrp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_HSRP, hsrp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_HSRP2_V6, hsrp_handle);
 }
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 001e997747..f89158019b 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -655,7 +655,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	stat_info->request_uri = NULL;
 	stat_info->http_host = NULL;
 
-	switch (pinfo->match_port) {
+	switch (pinfo->match_uint) {
 
 	case TCP_PORT_SSDP:	/* TCP_PORT_SSDP = UDP_PORT_SSDP */
 		proto = PROTO_SSDP;
@@ -1204,8 +1204,8 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		 * be called if something was on some particular port.
 		 */
 
-		handle = dissector_get_port_handle(port_subdissector_table,
-		    pinfo->match_port);
+		handle = dissector_get_uint_handle(port_subdissector_table,
+		    pinfo->match_uint);
 		if (handle == NULL && headers.content_type != NULL) {
 			/*
 			 * We didn't find any subdissector that
@@ -2333,12 +2333,12 @@ dissect_http_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 static void
 range_delete_http_tcp_callback(guint32 port) {
-	dissector_delete("tcp.port", port, http_handle);
+	dissector_delete_uint("tcp.port", port, http_handle);
 }
 
 static void
 range_add_http_tcp_callback(guint32 port) {
-	dissector_add("tcp.port", port, http_handle);
+	dissector_add_uint("tcp.port", port, http_handle);
 }
 
 static void
@@ -2658,12 +2658,12 @@ http_dissector_add(guint32 port, dissector_handle_t handle)
 	 * Register ourselves as the handler for that port number
 	 * over TCP.
 	 */
-	dissector_add("tcp.port", port, http_handle);
+	dissector_add_uint("tcp.port", port, http_handle);
 
 	/*
 	 * And register them in *our* table for that port.
 	 */
-	dissector_add("http.port", port, handle);
+	dissector_add_uint("http.port", port, handle);
 }
 
 void
@@ -2679,7 +2679,7 @@ proto_reg_handoff_http(void)
 	 * request or reply?  I.e., should there be an SSDP dissector?
 	 */
 	http_udp_handle = create_dissector_handle(dissect_http_udp, proto_http);
-	dissector_add("udp.port", UDP_PORT_SSDP, http_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SSDP, http_udp_handle);
 
 	ntlmssp_handle = find_dissector("ntlmssp");
 	gssapi_handle = find_dissector("gssapi");
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 76d5815871..4e23d4222c 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -205,6 +205,6 @@ proto_reg_handoff_hyperscsi(void)
   dissector_handle_t hs_handle;
 
   hs_handle = find_dissector("hyperscsi");
-  dissector_add("ethertype", ETHERTYPE_HYPERSCSI, hs_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_HYPERSCSI, hs_handle);
 
 }
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index b265c9602d..d797d0eaca 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -298,5 +298,5 @@ proto_reg_handoff_i2c(void)
 	sub_handles[SUB_DATA] = find_dissector("data");
 	sub_handles[SUB_IPMB] = find_dissector("ipmi");
 	i2c_handle = create_dissector_handle(dissect_i2c, proto_i2c);
-	dissector_add("wtap_encap", WTAP_ENCAP_I2C, i2c_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_I2C, i2c_handle);
 }
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 840cdd658b..9e531f9e52 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -503,5 +503,5 @@ proto_reg_handoff_iapp(void)
 	dissector_handle_t iapp_handle;
 
 	iapp_handle = create_dissector_handle(dissect_iapp, proto_iapp);
-	dissector_add("udp.port", UDP_PORT_IAPP, iapp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_IAPP, iapp_handle);
 }
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index b05d44143c..af9a8151d2 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -1414,7 +1414,7 @@ static guint32 dissect_iax2_command(tvbuff_t * tvb, guint32 offset,
 
   /* if this is a data call, set up a subdissector for the circuit */
   if(iax_call && ie_data.dataformat != (guint32)-1 && iax_call -> subdissector == NULL) {
-    iax_call -> subdissector = dissector_get_port_handle(iax2_dataformat_dissector_table, ie_data.dataformat );
+    iax_call -> subdissector = dissector_get_uint_handle(iax2_dataformat_dissector_table, ie_data.dataformat );
     iax_call -> dataformat = ie_data.dataformat;
   }
 
@@ -1976,7 +1976,7 @@ static void process_iax_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 
   if( !video && iax_call && iax_call->subdissector ) {
     call_dissector(iax_call->subdissector, tvb, pinfo, tree);
-  }else if( codec != 0 && dissector_try_port(iax2_codec_dissector_table, codec, tvb, pinfo, tree )) {
+  }else if( codec != 0 && dissector_try_uint(iax2_codec_dissector_table, codec, tvb, pinfo, tree )) {
     /* codec dissector handled our data */
   }else {
     /* we don't know how to dissect our data: dissect it as data */
@@ -2808,10 +2808,10 @@ proto_reg_handoff_iax2 (void)
 {
   dissector_handle_t v110_handle = NULL;
 
-  dissector_add("udp.port", IAX2_PORT, find_dissector("iax2"));
+  dissector_add_uint("udp.port", IAX2_PORT, find_dissector("iax2"));
   v110_handle =  find_dissector("v110");
   if(v110_handle)
-	  dissector_add("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle);
+	  dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_V110, v110_handle);
   data_handle = find_dissector("data");
 }
 
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c
index 1a7b61eea3..884024cc96 100644
--- a/epan/dissectors/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
@@ -339,5 +339,5 @@ proto_reg_handoff_icap(void)
 
         data_handle = find_dissector("data");
 	icap_handle = create_dissector_handle(dissect_icap, proto_icap);
-	dissector_add("tcp.port", TCP_PORT_ICAP, icap_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_ICAP, icap_handle);
 }
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index f2fc72a9ce..d2b6d0c1b7 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -1110,5 +1110,5 @@ proto_reg_handoff_icmp(void)
   icmp_handle = find_dissector("icmp");
   data_handle = find_dissector("data");
 
-  dissector_add("ip.proto", IP_PROTO_ICMP, icmp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_ICMP, icmp_handle);
 }
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index e09a441b4e..b9aa428c08 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -3316,7 +3316,7 @@ proto_reg_handoff_icmpv6(void)
     dissector_handle_t icmpv6_handle;
 
     icmpv6_handle = create_dissector_handle(dissect_icmpv6, proto_icmpv6);
-    dissector_add("ip.proto", IP_PROTO_ICMPV6, icmpv6_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_ICMPV6, icmpv6_handle);
 
     /*
      * Get a handle for the IPv6 dissector.
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index df75b2d554..fb6c3af06e 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -246,5 +246,5 @@ proto_reg_handoff_icp(void)
 	dissector_handle_t icp_handle;
 
 	icp_handle = create_dissector_handle(dissect_icp, proto_icp);
-	dissector_add("udp.port", UDP_PORT_ICP, icp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_ICP, icp_handle);
 }
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index b3c62504bd..aea2f6c133 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -1792,5 +1792,5 @@ proto_reg_handoff_icq(void)
     dissector_handle_t icq_handle;
 
     icq_handle = new_create_dissector_handle(dissect_icq, proto_icq);
-    dissector_add("udp.port", UDP_PORT_ICQ, icq_handle);
+    dissector_add_uint("udp.port", UDP_PORT_ICQ, icq_handle);
 }
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index ae4d8cc98a..578b07c52a 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -1008,12 +1008,12 @@ prefs_register_idmp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if(idmp_handle)
-    dissector_delete("tcp.port", tcp_port, idmp_handle);
+    dissector_delete_uint("tcp.port", tcp_port, idmp_handle);
 
   /* Set our port number for future use */
   tcp_port = global_idmp_tcp_port;
 
   if((tcp_port > 0) && idmp_handle)
-    dissector_add("tcp.port", global_idmp_tcp_port, idmp_handle);
+    dissector_add_uint("tcp.port", global_idmp_tcp_port, idmp_handle);
 
 }
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 3bb2bd0d30..cad8837b40 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -126,7 +126,7 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	/*
 	 * Hand off to the dissector for the packet type.
 	 */
-	if (dissector_try_port(idp_type_dissector_table, type, next_tvb,
+	if (dissector_try_uint(idp_type_dissector_table, type, next_tvb,
 	    pinfo, tree))
 		return;
 
@@ -206,8 +206,8 @@ proto_reg_handoff_idp(void)
 	dissector_handle_t idp_handle;
 
 	idp_handle = create_dissector_handle(dissect_idp, proto_idp);
-	dissector_add("ethertype", ETHERTYPE_XNS_IDP, idp_handle);
-	dissector_add("chdlctype", ETHERTYPE_XNS_IDP, idp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_XNS_IDP, idp_handle);
+	dissector_add_uint("chdlctype", ETHERTYPE_XNS_IDP, idp_handle);
 
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index fe04b68eac..dbb87bacae 100644
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -1594,6 +1594,6 @@ proto_reg_handoff_iec104(void)
 	iec104apci_handle = create_dissector_handle(dissect_iec104reas, proto_iec104apci);
 	iec104asdu_handle = create_dissector_handle(dissect_iec104asdu, proto_iec104asdu);
 
-	dissector_add("tcp.port", iec104port, iec104apci_handle);
+	dissector_add_uint("tcp.port", iec104port, iec104apci_handle);
 }
 
diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c
index 5d7fce412d..b009633da7 100644
--- a/epan/dissectors/packet-ieee1722.c
+++ b/epan/dissectors/packet-ieee1722.c
@@ -380,5 +380,5 @@ void proto_reg_handoff_1722(void)
     dissector_handle_t avbtp_handle;
 
     avbtp_handle = create_dissector_handle(dissect_1722, proto_1722);
-    dissector_add("ethertype", ETHERTYPE_AVBTP, avbtp_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_AVBTP, avbtp_handle);
 }
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a704e9dd28..9090b32faa 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -14128,47 +14128,47 @@ proto_reg_handoff_ieee80211(void)
   data_handle = find_dissector("data");
 
   ieee80211_handle = find_dissector("wlan");
-  dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle);
-  dissector_add("ethertype", ETHERTYPE_CENTRINO_PROMISC, ieee80211_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_CENTRINO_PROMISC, ieee80211_handle);
 
   /* Register handoff to radio-header dissectors */
   radio_handle = create_dissector_handle(dissect_radio, proto_radio);
-  dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WITH_RADIO, radio_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WITH_RADIO, radio_handle);
 
   prism_handle = create_dissector_handle(dissect_prism, proto_prism);
-  dissector_add("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle);
 
   wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap);
-  dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_AVS, wlancap_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_AVS, wlancap_handle);
 
   /* Register handoff to Aruba GRE */
-  dissector_add("gre.proto", GRE_ARUBA_8200, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8210, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8220, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8230, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8240, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8250, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8260, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8270, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8280, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8290, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82A0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82B0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82C0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82D0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82E0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_82F0, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8300, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8310, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8320, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8330, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8340, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8350, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8360, ieee80211_handle);
-  dissector_add("gre.proto", GRE_ARUBA_8370, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8200, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8210, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8220, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8230, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8240, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8250, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8260, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8270, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8280, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8290, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82A0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82B0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82C0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82D0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82E0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_82F0, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8300, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8310, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8320, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8330, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8340, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8350, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8360, ieee80211_handle);
+  dissector_add_uint("gre.proto", GRE_ARUBA_8370, ieee80211_handle);
 
   data_encap_handle = create_dissector_handle(dissect_data_encap, proto_wlan);
-  dissector_add("ethertype", ETHERTYPE_IEEE80211_DATA_ENCAP,
+  dissector_add_uint("ethertype", ETHERTYPE_IEEE80211_DATA_ENCAP,
                 data_encap_handle);
 }
 
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 7e5fd870d8..8ff43e13b1 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -2788,13 +2788,13 @@ void proto_reg_handoff_ieee802154(void)
         ieee802154_nofcs_handle = find_dissector("wpan_nofcs");
         data_handle         = find_dissector("data");
 
-        dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle);
-        dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle);
-        dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle);
+        dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle);
+        dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle);
+        dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle);
 
         prefs_initialized = TRUE;
     } else {
-        dissector_delete("ethertype", old_ieee802154_ethertype, ieee802154_handle);
+        dissector_delete_uint("ethertype", old_ieee802154_ethertype, ieee802154_handle);
     }
 
     old_ieee802154_ethertype = ieee802154_ethertype;
@@ -2809,7 +2809,7 @@ void proto_reg_handoff_ieee802154(void)
     g_byte_array_free(bytes, TRUE);
 
     /* Register dissector handles. */
-    dissector_add("ethertype", ieee802154_ethertype, ieee802154_handle);
+    dissector_add_uint("ethertype", ieee802154_ethertype, ieee802154_handle);
 } /* proto_reg_handoff_ieee802154 */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 534bc64d6c..be40e62a38 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -435,14 +435,14 @@ proto_reg_handoff_ieee8021ah(void)
 						    proto_ieee8021ah);
 	ieee8021ad_handle = create_dissector_handle(dissect_ieee8021ad,
 						    proto_ieee8021ad);
-	dissector_add("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle);
 	prefs_initialized = TRUE;
     }
     else {
-	dissector_delete("ethertype", old_ieee8021ah_ethertype, ieee8021ah_handle);
+	dissector_delete_uint("ethertype", old_ieee8021ah_ethertype, ieee8021ah_handle);
     }
 
     old_ieee8021ah_ethertype = ieee8021ah_ethertype;
-    dissector_add("ethertype", ieee8021ah_ethertype, ieee8021ah_handle);
+    dissector_add_uint("ethertype", ieee8021ah_ethertype, ieee8021ah_handle);
 
 }
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index 440f2588c4..d59ac234e7 100644
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -137,7 +137,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	next_tvb = tvb_new_subset_remaining(tvb, offset+5);
 	if (subdissector_table != NULL) {
 		/* do lookup with the subdissector table */
-		if (dissector_try_port(subdissector_table, etype, next_tvb,
+		if (dissector_try_uint(subdissector_table, etype, next_tvb,
 		    pinfo, tree))
 			return;
 	}
@@ -182,7 +182,7 @@ proto_reg_handoff_ieee802a(void)
 
 	ieee802a_handle = create_dissector_handle(dissect_ieee802a,
 	    proto_ieee802a);
-	dissector_add("ethertype", ETHERTYPE_IEEE802_OUI_EXTENDED,
+	dissector_add_uint("ethertype", ETHERTYPE_IEEE802_OUI_EXTENDED,
 	    ieee802a_handle);
 
 	/*
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index cb1429c829..853154a833 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -1219,5 +1219,5 @@ proto_reg_handoff_igmp(void)
 	dissector_handle_t igmp_handle;
 
 	igmp_handle = create_dissector_handle(dissect_igmp, proto_igmp);
-	dissector_add("ip.proto", IP_PROTO_IGMP, igmp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_IGMP, igmp_handle);
 }
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index bd14ba3006..b4f35f3e75 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -206,7 +206,7 @@ proto_reg_handoff_igrp(void)
   dissector_handle_t igrp_handle;
 
   igrp_handle = create_dissector_handle(dissect_igrp, proto_igrp);
-  dissector_add("ip.proto", IP_PROTO_IGRP, igrp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_IGRP, igrp_handle);
 }
 
 /*	IGRP Packet structure:
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index e4ca1c2625..f9807967ec 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -1188,5 +1188,5 @@ proto_reg_handoff_jfif(void)
 	dissector_add_string("media_type", "image/jpg", jfif_handle);
 	dissector_add_string("media_type", "image/jpeg", jfif_handle);
 
-	dissector_add("wtap_encap", WTAP_ENCAP_JPEG_JFIF, jfif_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_JPEG_JFIF, jfif_handle);
 }
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index b8a33bca14..6f0f94d517 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -60,7 +60,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "IMAP");
 
 
-	if (pinfo->match_port == pinfo->destport)
+	if (pinfo->match_uint == pinfo->destport)
 		is_request = TRUE;
 	else
 		is_request = FALSE;
@@ -189,6 +189,6 @@ proto_reg_handoff_imap(void)
   dissector_handle_t imap_handle;
 
   imap_handle = create_dissector_handle(dissect_imap, proto_imap);
-  dissector_add("tcp.port", TCP_PORT_IMAP, imap_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_IMAP, imap_handle);
   ssl_dissector_add(TCP_PORT_SSL_IMAP, "imap", TRUE);
 }
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index bf63f90c35..0bab1ffa2a 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -2529,7 +2529,7 @@ static void parse_PAYLOAD(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *
             pd_save = pinfo->private_data;
 
             TRY {
-                dissector_found = dissector_try_port(ethertype_dissector_table,
+                dissector_found = dissector_try_uint(ethertype_dissector_table,
                                      etype, next_tvb, pinfo, top_tree);
             }
             CATCH(BoundsError) {
@@ -2708,7 +2708,7 @@ static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_i
     }
 
     next_tvb = tvb_new_subset(tvb, *offset, captured_length, reported_length);
-    if (!dissector_try_port(ethertype_dissector_table, ether_type,
+    if (!dissector_try_uint(ethertype_dissector_table, ether_type,
             next_tvb, pinfo, top_tree))
        call_dissector(data_handle, next_tvb, pinfo, top_tree);
 
@@ -7443,5 +7443,5 @@ void proto_reg_handoff_infiniband(void)
 
     /* create and announce an anonymous RoCE dissector */
     roce_handle = create_dissector_handle(dissect_roce, proto_infiniband);
-    dissector_add("ethertype", ETHERTYPE_ROCE, roce_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_ROCE, roce_handle);
 }
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 6733ef4900..27560c7e08 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -1736,7 +1736,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
      even be labelled as an IP frame; ideally, if a frame being dissected
      throws an exception, it'll be labelled as a mangled frame of the
      type in question. */
-  } else if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, parent_tree)) {
+  } else if (!dissector_try_uint(ip_dissector_table, nxt, next_tvb, pinfo, parent_tree)) {
     /* Unknown protocol */
     if (update_col_info) {
       col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%02x)", ipprotostr(iph->ip_p), iph->ip_p);
@@ -2059,19 +2059,19 @@ proto_reg_handoff_ip(void)
 	tapa_handle = find_dissector("tapa");
         data_handle = find_dissector("data");
 
-	dissector_add("ethertype", ETHERTYPE_IP, ip_handle);
-	dissector_add("ppp.protocol", PPP_IP, ip_handle);
-	dissector_add("ppp.protocol", ETHERTYPE_IP, ip_handle);
-	dissector_add("gre.proto", ETHERTYPE_IP, ip_handle);
-	dissector_add("gre.proto", GRE_WCCP, ip_handle);
-	dissector_add("llc.dsap", SAP_IP, ip_handle);
-	dissector_add("ip.proto", IP_PROTO_IPIP, ip_handle);
-	dissector_add("null.type", BSD_AF_INET, ip_handle);
-	dissector_add("chdlctype", ETHERTYPE_IP, ip_handle);
-	dissector_add("osinl.excl", NLPID_IP, ip_handle);
-	dissector_add("fr.ietf", NLPID_IP, ip_handle);
-	dissector_add("x.25.spi", NLPID_IP, ip_handle);
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle);
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IP, ip_handle);
+	dissector_add_uint("ppp.protocol", PPP_IP, ip_handle);
+	dissector_add_uint("ppp.protocol", ETHERTYPE_IP, ip_handle);
+	dissector_add_uint("gre.proto", ETHERTYPE_IP, ip_handle);
+	dissector_add_uint("gre.proto", GRE_WCCP, ip_handle);
+	dissector_add_uint("llc.dsap", SAP_IP, ip_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_IPIP, ip_handle);
+	dissector_add_uint("null.type", BSD_AF_INET, ip_handle);
+	dissector_add_uint("chdlctype", ETHERTYPE_IP, ip_handle);
+	dissector_add_uint("osinl.excl", NLPID_IP, ip_handle);
+	dissector_add_uint("fr.ietf", NLPID_IP, ip_handle);
+	dissector_add_uint("x.25.spi", NLPID_IP, ip_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IP_1201, ip_handle);
 	dissector_add_handle("udp.port", ip_handle);
 }
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 2cb72ec33c..f556095293 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -422,7 +422,7 @@ proto_reg_handoff_ipdc(void)
 	static dissector_handle_t ipdc_tcp_handle = NULL;
 
 	if (ipdc_tcp_handle) {
-		dissector_delete("tcp.port", last_ipdc_port_pref,
+		dissector_delete_uint("tcp.port", last_ipdc_port_pref,
 			ipdc_tcp_handle);
 	} else {
 		ipdc_tcp_handle =
@@ -431,5 +431,5 @@ proto_reg_handoff_ipdc(void)
 	}
 
 	last_ipdc_port_pref = ipdc_port_pref;
-	dissector_add("tcp.port", ipdc_port_pref, ipdc_tcp_handle);
+	dissector_add_uint("tcp.port", ipdc_port_pref, ipdc_tcp_handle);
 }
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index a8a82aab9c..e3b7f49bf5 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -133,7 +133,7 @@ proto_reg_handoff_ipfc (void)
     dissector_handle_t ipfc_handle;
 
     ipfc_handle = create_dissector_handle (dissect_ipfc, proto_ipfc);
-    dissector_add("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_handle);
 
     llc_handle = find_dissector ("llc");
 }
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index 3d2deb7aea..e75d0da368 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -321,7 +321,7 @@ proto_reg_handoff_ipmi_session(void)
 	dissector_handle_t ipmi_session_handle;
 
 	ipmi_session_handle = new_create_dissector_handle(dissect_ipmi_session, proto_ipmi_session);
-	dissector_add("rmcp.class", RMCP_CLASS_IPMI, ipmi_session_handle);
+	dissector_add_uint("rmcp.class", RMCP_CLASS_IPMI, ipmi_session_handle);
 
 	data_handle = find_dissector("data");
 	ipmi_handle = find_dissector("ipmi");
diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c
index 215e020674..4eb2dcd301 100644
--- a/epan/dissectors/packet-ipnet.c
+++ b/epan/dissectors/packet-ipnet.c
@@ -152,5 +152,5 @@ proto_reg_handoff_ipnet(void)
   ipv6_handle = find_dissector("ipv6");
 
   ipnet_handle = create_dissector_handle(dissect_ipnet, proto_ipnet);
-  dissector_add("wtap_encap", WTAP_ENCAP_IPNET, ipnet_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_IPNET, ipnet_handle);
 }
diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c
index ec619de2ab..cbaa06528c 100644
--- a/epan/dissectors/packet-ipsec-tcp.c
+++ b/epan/dissectors/packet-ipsec-tcp.c
@@ -242,10 +242,10 @@ proto_reg_handoff_tcpencap(void)
 		udp_handle = find_dissector("udp");
 		initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", tcpencap_tcp_port, tcpencap_handle);
+		dissector_delete_uint("tcp.port", tcpencap_tcp_port, tcpencap_handle);
 	}
 
 	tcpencap_tcp_port = global_tcpencap_tcp_port;
-	dissector_add("tcp.port", global_tcpencap_tcp_port, tcpencap_handle);
+	dissector_add_uint("tcp.port", global_tcpencap_tcp_port, tcpencap_handle);
 }
 
diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c
index 248e9a764c..40f25487c6 100644
--- a/epan/dissectors/packet-ipsec-udp.c
+++ b/epan/dissectors/packet-ipsec-udp.c
@@ -103,5 +103,5 @@ proto_reg_handoff_udpencap(void)
   isakmp_handle = find_dissector("isakmp");
 
   udpencap_handle = create_dissector_handle(dissect_udpencap, proto_udpencap);
-  dissector_add("udp.port", 4500, udpencap_handle);
+  dissector_add_uint("udp.port", 4500, udpencap_handle);
 }
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 4bff6d4334..81464d5661 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -1392,7 +1392,7 @@ dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   }
 
   /* do lookup with the subdissector table */
-  if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
+  if (!dissector_try_uint(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
     call_dissector(data_handle,next_tvb, pinfo, next_tree);
   }
 }
@@ -2502,7 +2502,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			      /* Get the encapsulated protocol */
 			      encapsulated_protocol = tvb_get_guint8(tvb_decrypted, decrypted_len - esp_iv_len - esp_auth_len - 1);
 
-			      if(dissector_try_port(ip_dissector_table,
+			      if(dissector_try_uint(ip_dissector_table,
 						    encapsulated_protocol,
 						    tvb_new_subset(tvb_decrypted, 0,
 								   decrypted_len - esp_auth_len - esp_pad_len - esp_iv_len - 2,
@@ -2615,7 +2615,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    {
 	      esp_pad_len = tvb_get_guint8(tvb, len - 14);
 	      encapsulated_protocol = tvb_get_guint8(tvb, len - 13);
-	      if(dissector_try_port(ip_dissector_table,
+	      if(dissector_try_uint(ip_dissector_table,
 				    encapsulated_protocol,
 				    tvb_new_subset(tvb,
 						   sizeof(struct newesp),
@@ -2724,7 +2724,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     decomp = tvb_uncompress(data, 0, tvb_length(data));
     if (decomp) {
         add_new_data_source(pinfo, decomp, "IPcomp inflated data");
-        if (!dissector_try_port(ip_dissector_table, ipcomp.comp_nxt, decomp, pinfo, tree))
+        if (!dissector_try_uint(ip_dissector_table, ipcomp.comp_nxt, decomp, pinfo, tree))
             call_dissector(data_handle, decomp, pinfo, tree);
     }
   }
@@ -2978,11 +2978,11 @@ proto_reg_handoff_ipsec(void)
 
   data_handle = find_dissector("data");
   ah_handle = find_dissector("ah");
-  dissector_add("ip.proto", IP_PROTO_AH, ah_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_AH, ah_handle);
   esp_handle = find_dissector("esp");
-  dissector_add("ip.proto", IP_PROTO_ESP, esp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_ESP, esp_handle);
   ipcomp_handle = create_dissector_handle(dissect_ipcomp, proto_ipcomp);
-  dissector_add("ip.proto", IP_PROTO_IPCOMP, ipcomp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_IPCOMP, ipcomp_handle);
 
   ip_dissector_table = find_dissector_table("ip.proto");
 }
diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c
index 36606e141e..2e207ca82f 100644
--- a/epan/dissectors/packet-ipsi-ctl.c
+++ b/epan/dissectors/packet-ipsi-ctl.c
@@ -256,7 +256,7 @@ void proto_reg_handoff_ipsictl(void)
 
   ipsictl_handle = create_dissector_handle(dissect_ipsictl, proto_ipsictl);
 
-  dissector_add("tcp.port", IPSICTL_PORT, ipsictl_handle);
+  dissector_add_uint("tcp.port", IPSICTL_PORT, ipsictl_handle);
 
 }
 
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 404e941799..63dff538a3 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -1702,7 +1702,7 @@ again:
        * whether it is a known protocol. If not, then it
        * is an unknown IPv6 option
        */
-      if (!dissector_get_port_handle(ip_dissector_table, nxt)) {
+      if (!dissector_get_uint_handle(ip_dissector_table, nxt)) {
         advance = dissect_unknown_option(tvb, offset, ipv6_tree);
         nxt = tvb_get_guint8(tvb, offset);
         poffset = offset;
@@ -1749,7 +1749,7 @@ again:
 
 
   /* do lookup with the subdissector table */
-  if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
+  if (!dissector_try_uint(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
     /* Unknown protocol.
        Handle "no next header" specially. */
     if (nxt == IP_PROTO_NONE) {
@@ -2274,19 +2274,19 @@ proto_reg_handoff_ipv6(void)
 
   data_handle = find_dissector("data");
   ipv6_handle = find_dissector("ipv6");
-  dissector_add("ethertype", ETHERTYPE_IPv6, ipv6_handle);
-  dissector_add("ppp.protocol", PPP_IPV6, ipv6_handle);
-  dissector_add("ppp.protocol", ETHERTYPE_IPv6, ipv6_handle);
-  dissector_add("gre.proto", ETHERTYPE_IPv6, ipv6_handle);
-  dissector_add("ip.proto", IP_PROTO_IPV6, ipv6_handle);
-  dissector_add("null.type", BSD_AF_INET6_BSD, ipv6_handle);
-  dissector_add("null.type", BSD_AF_INET6_FREEBSD, ipv6_handle);
-  dissector_add("null.type", BSD_AF_INET6_DARWIN, ipv6_handle);
-  dissector_add("chdlctype", ETHERTYPE_IPv6, ipv6_handle);
-  dissector_add("fr.ietf", NLPID_IP6, ipv6_handle);
-  dissector_add("osinl.excl", NLPID_IP6, ipv6_handle);
-  dissector_add("x.25.spi", NLPID_IP6, ipv6_handle);
-  dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_IPv6, ipv6_handle);
+  dissector_add_uint("ppp.protocol", PPP_IPV6, ipv6_handle);
+  dissector_add_uint("ppp.protocol", ETHERTYPE_IPv6, ipv6_handle);
+  dissector_add_uint("gre.proto", ETHERTYPE_IPv6, ipv6_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_IPV6, ipv6_handle);
+  dissector_add_uint("null.type", BSD_AF_INET6_BSD, ipv6_handle);
+  dissector_add_uint("null.type", BSD_AF_INET6_FREEBSD, ipv6_handle);
+  dissector_add_uint("null.type", BSD_AF_INET6_DARWIN, ipv6_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_IPv6, ipv6_handle);
+  dissector_add_uint("fr.ietf", NLPID_IP6, ipv6_handle);
+  dissector_add_uint("osinl.excl", NLPID_IP6, ipv6_handle);
+  dissector_add_uint("x.25.spi", NLPID_IP6, ipv6_handle);
+  dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle);
 
   ip_dissector_table = find_dissector_table("ip.proto");
 }
diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index 4ddc770338..75743b57bf 100644
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -339,5 +339,5 @@ proto_reg_handoff_ipvs_syncd(void)
 	dissector_handle_t ipvs_syncd_handle;
 
 	ipvs_syncd_handle = create_dissector_handle(dissect_ipvs_syncd, proto_ipvs_syncd);
-	dissector_add("udp.port", IPVS_SYNCD_PORT, ipvs_syncd_handle);
+	dissector_add_uint("udp.port", IPVS_SYNCD_PORT, ipvs_syncd_handle);
 }
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 21be0ee675..eab75095e6 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -398,11 +398,11 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	tap_queue_packet(ipx_tap, pinfo, ipxh);
 
 	if (second_socket != IPX_SOCKET_NWLINK_SMB_NAMEQUERY) {
-		if (dissector_try_port(ipx_socket_dissector_table, first_socket,
+		if (dissector_try_uint(ipx_socket_dissector_table, first_socket,
 		    next_tvb, pinfo, tree))
 			return;
 	}
-	if (dissector_try_port(ipx_socket_dissector_table, second_socket,
+	if (dissector_try_uint(ipx_socket_dissector_table, second_socket,
 	    next_tvb, pinfo, tree))
 		return;
 
@@ -410,7 +410,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	 * Neither of them are known; try the packet type, which will
 	 * at least let us, for example, dissect SPX packets as SPX.
 	 */
-	if (dissector_try_port(ipx_type_dissector_table, ipxh->ipx_type, next_tvb,
+	if (dissector_try_uint(ipx_type_dissector_table, ipxh->ipx_type, next_tvb,
 	    pinfo, tree))
 		return;
 
@@ -813,13 +813,13 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		pinfo->private_data = &spx_infox;
 
 		next_tvb = tvb_new_subset_remaining(tvb, SPX_HEADER_LEN);
-		if (dissector_try_port(spx_socket_dissector_table, low_socket,
+		if (dissector_try_uint(spx_socket_dissector_table, low_socket,
 		    next_tvb, pinfo, tree))
 		{
 			pinfo->private_data = pd_save;
 			return;
 		}
-		if (dissector_try_port(spx_socket_dissector_table, high_socket,
+		if (dissector_try_uint(spx_socket_dissector_table, high_socket,
 		    next_tvb, pinfo, tree))
 		{
 			pinfo->private_data = pd_save;
@@ -1522,35 +1522,35 @@ proto_reg_handoff_ipx(void)
 	dissector_handle_t serialization_handle, ipxmsg_handle;
 
 	ipx_handle = find_dissector("ipx");
-	dissector_add("udp.port", UDP_PORT_IPX, ipx_handle);
-	dissector_add("ethertype", ETHERTYPE_IPX, ipx_handle);
-	dissector_add("chdlctype", ETHERTYPE_IPX, ipx_handle);
-	dissector_add("ppp.protocol", PPP_IPX, ipx_handle);
-	dissector_add("llc.dsap", SAP_NETWARE1, ipx_handle);
-	dissector_add("llc.dsap", SAP_NETWARE2, ipx_handle);
-	dissector_add("sll.ltype", LINUX_SLL_P_802_3, ipx_handle);
-	dissector_add("null.type", BSD_AF_IPX, ipx_handle);
-	dissector_add("gre.proto", ETHERTYPE_IPX, ipx_handle);
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle);
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_NOVELL_EC, ipx_handle);
+	dissector_add_uint("udp.port", UDP_PORT_IPX, ipx_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IPX, ipx_handle);
+	dissector_add_uint("chdlctype", ETHERTYPE_IPX, ipx_handle);
+	dissector_add_uint("ppp.protocol", PPP_IPX, ipx_handle);
+	dissector_add_uint("llc.dsap", SAP_NETWARE1, ipx_handle);
+	dissector_add_uint("llc.dsap", SAP_NETWARE2, ipx_handle);
+	dissector_add_uint("sll.ltype", LINUX_SLL_P_802_3, ipx_handle);
+	dissector_add_uint("null.type", BSD_AF_IPX, ipx_handle);
+	dissector_add_uint("gre.proto", ETHERTYPE_IPX, ipx_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_NOVELL_EC, ipx_handle);
 
 	spx_handle = create_dissector_handle(dissect_spx, proto_spx);
-	dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle);
+	dissector_add_uint("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle);
 
 	ipxsap_handle = find_dissector("ipxsap");
-	dissector_add("ipx.socket", IPX_SOCKET_SAP, ipxsap_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SAP, ipxsap_handle);
 
 	ipxrip_handle = create_dissector_handle(dissect_ipxrip, proto_ipxrip);
-	dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, ipxrip_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_IPXRIP, ipxrip_handle);
 
 	serialization_handle = create_dissector_handle(dissect_serialization,
 	    proto_serialization);
-	dissector_add("ipx.socket", IPX_SOCKET_SERIALIZATION,
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SERIALIZATION,
 	    serialization_handle);
 
 	ipxmsg_handle = create_dissector_handle(dissect_ipxmsg, proto_ipxmsg);
-	dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, ipxmsg_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE1, ipxmsg_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE, ipxmsg_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE1, ipxmsg_handle);
 
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index 001b0d504a..a31fb5406f 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -457,5 +457,5 @@ proto_reg_handoff_ipxwan(void)
 
 	ipxwan_handle = create_dissector_handle(dissect_ipxwan,
 	    proto_ipxwan);
-	dissector_add("ipx.socket", IPX_SOCKET_IPXWAN, ipxwan_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_IPXWAN, ipxwan_handle);
 }
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index 13ae12e05b..32b63c4046 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -79,7 +79,7 @@ dissect_irc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
 		col_set_str(pinfo->cinfo, COL_INFO,
-		    (pinfo->match_port == pinfo->destport) ? "Request" : "Response");
+		    (pinfo->match_uint == pinfo->destport) ? "Request" : "Response");
 	}
 
 	if (tree)
@@ -110,7 +110,7 @@ dissect_irc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			if (linelen != 0)
 			{
-				if (pinfo->match_port == pinfo->destport)
+				if (pinfo->match_uint == pinfo->destport)
 				{
 					dissect_irc_request(irc_tree, tvb, offset, linelen);
 				}
@@ -153,6 +153,6 @@ proto_reg_handoff_irc(void)
 	dissector_handle_t irc_handle;
 
 	irc_handle = create_dissector_handle(dissect_irc, proto_irc);
-	dissector_add("tcp.port", TCP_PORT_IRC, irc_handle);
-	dissector_add("tcp.port", TCP_PORT_DIRCPROXY, irc_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_IRC, irc_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_DIRCPROXY, irc_handle);
 }
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 32dc0411f6..b1e941e6a4 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -5924,6 +5924,6 @@ proto_reg_handoff_isakmp(void)
 
   isakmp_handle = find_dissector("isakmp");
   eap_handle = find_dissector("eap");
-  dissector_add("udp.port", UDP_PORT_ISAKMP, isakmp_handle);
-  dissector_add("tcp.port", TCP_PORT_ISAKMP, isakmp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_ISAKMP, isakmp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_ISAKMP, isakmp_handle);
 }
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c
index 5c8829a237..cb44c3bce8 100644
--- a/epan/dissectors/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
@@ -206,5 +206,5 @@ proto_reg_handoff_isdn(void)
 
 	isdn_handle = create_dissector_handle(dissect_isdn, proto_isdn);
 
-	dissector_add("wtap_encap", WTAP_ENCAP_ISDN, isdn_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_ISDN, isdn_handle);
 }
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index e2550295da..d09f906626 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -322,6 +322,6 @@ proto_reg_handoff_isis(void)
     dissector_handle_t isis_handle;
 
     isis_handle = create_dissector_handle(dissect_isis, proto_isis);
-    dissector_add("osinl", NLPID_ISO10589_ISIS, isis_handle);
-    dissector_add("ethertype", ETHERTYPE_L2ISIS, isis_handle);
+    dissector_add_uint("osinl", NLPID_ISO10589_ISIS, isis_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_L2ISIS, isis_handle);
 }
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c
index 47beed1bea..970570184c 100644
--- a/epan/dissectors/packet-ismacryp.c
+++ b/epan/dissectors/packet-ismacryp.c
@@ -1026,13 +1026,13 @@ void proto_reg_handoff_ismacryp(void)
 	else { /* ismacryp_prefs_initialized = TRUE */
 		/* delete existing association of ismacryp with payload_type */
 		if ( dynamic_payload_type > 95 ){
-			dissector_delete("rtp.pt", dynamic_payload_type, ismacryp_handle);
+			dissector_delete_uint("rtp.pt", dynamic_payload_type, ismacryp_handle);
 		}
 	}
 	/* always do the following */
 	dynamic_payload_type = pref_dynamic_payload_type; /*update payload_type to new value */
 	if ( dynamic_payload_type > 95 ){
-		dissector_add("rtp.pt", dynamic_payload_type, ismacryp_handle);
+		dissector_add_uint("rtp.pt", dynamic_payload_type, ismacryp_handle);
 	}
 	
 }
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index 8035c990ea..95e83c58d2 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -881,5 +881,5 @@ proto_reg_handoff_ismp(void)
 
 	ismp_handle = create_dissector_handle(dissect_ismp,
 	    proto_ismp);
-	dissector_add("ethertype", ETHERTYPE_ISMP, ismp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_ISMP, ismp_handle);
 }
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index b8c73c1576..d9a6886002 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -1988,6 +1988,6 @@ proto_reg_handoff_isns(void)
     isns_tcp_handle = new_create_dissector_handle(dissect_isns_tcp,proto_isns);
     isns_udp_handle = new_create_dissector_handle(dissect_isns_udp,proto_isns);
 
-    dissector_add("tcp.port",ISNS_TCP_PORT,isns_tcp_handle);
-    dissector_add("udp.port",ISNS_UDP_PORT,isns_udp_handle);
+    dissector_add_uint("tcp.port",ISNS_TCP_PORT,isns_tcp_handle);
+    dissector_add_uint("udp.port",ISNS_UDP_PORT,isns_udp_handle);
 }
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index e4bfe4c0ca..0c8d7d0220 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -8654,7 +8654,7 @@ proto_reg_handoff_isup(void)
 
   isup_handle = create_dissector_handle(dissect_isup, proto_isup);
   application_isup_handle = create_dissector_handle(dissect_application_isup, proto_isup);
-  dissector_add("mtp3.service_indicator", MTP3_ISUP_SERVICE_INDICATOR, isup_handle);
+  dissector_add_uint("mtp3.service_indicator", MTP3_ISUP_SERVICE_INDICATOR, isup_handle);
   dissector_add_string("media_type","application/isup", application_isup_handle);
   dissector_add_string("tali.opcode", "isot", isup_handle);
 
@@ -8693,6 +8693,6 @@ proto_reg_handoff_bicc(void)
   q931_ie_handle = find_dissector("q931.ie");
 
   bicc_handle = create_dissector_handle(dissect_bicc, proto_bicc);
-  dissector_add("mtp3.service_indicator", MTP3_BICC_SERVICE_INDICATOR, bicc_handle);
-  dissector_add("sctp.ppi", BICC_PAYLOAD_PROTOCOL_ID, bicc_handle);
+  dissector_add_uint("mtp3.service_indicator", MTP3_BICC_SERVICE_INDICATOR, bicc_handle);
+  dissector_add_uint("sctp.ppi", BICC_PAYLOAD_PROTOCOL_ID, bicc_handle);
 }
diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c
index 66836aca66..fd775a22c7 100644
--- a/epan/dissectors/packet-itdm.c
+++ b/epan/dissectors/packet-itdm.c
@@ -480,9 +480,9 @@ proto_reg_handoff_itdm(void)
 		data_handle = find_dissector("data");
 		Initialized=TRUE;
 	} else {
-		dissector_delete("mpls.label", ItdmMPLSLabel, itdm_handle);
+		dissector_delete_uint("mpls.label", ItdmMPLSLabel, itdm_handle);
 	}
 
 	ItdmMPLSLabel = gbl_ItdmMPLSLabel;
-	dissector_add("mpls.label", gbl_ItdmMPLSLabel, itdm_handle);
+	dissector_add_uint("mpls.label", gbl_ItdmMPLSLabel, itdm_handle);
 }
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index eb19509ee6..2608978fb2 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -967,6 +967,6 @@ proto_reg_handoff_iua(void)
   q931_handle = find_dissector("q931");
   x25_handle  = find_dissector("x.25");
 
-  dissector_add("sctp.port", SCTP_PORT_IUA,           iua_handle);
-  dissector_add("sctp.ppi",  IUA_PAYLOAD_PROTOCOL_ID, iua_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_IUA,           iua_handle);
+  dissector_add_uint("sctp.ppi",  IUA_PAYLOAD_PROTOCOL_ID, iua_handle);
 }
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 534e933bfb..fa2de47b04 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -861,14 +861,14 @@ void proto_reg_handoff_iuup(void) {
         iuup_prefs_initialized = TRUE;
     } else {
         if ( saved_dynamic_payload_type > 95 ) {
-            dissector_delete("rtp.pt", saved_dynamic_payload_type, iuup_handle);
+            dissector_delete_uint("rtp.pt", saved_dynamic_payload_type, iuup_handle);
         }
     }
 
     saved_dynamic_payload_type = global_dynamic_payload_type;
 
     if ( global_dynamic_payload_type > 95 ) {
-        dissector_add("rtp.pt", global_dynamic_payload_type, iuup_handle);
+        dissector_add_uint("rtp.pt", global_dynamic_payload_type, iuup_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-jabber.c b/epan/dissectors/packet-jabber.c
index ec990846ad..aeeab444fe 100644
--- a/epan/dissectors/packet-jabber.c
+++ b/epan/dissectors/packet-jabber.c
@@ -69,7 +69,7 @@ dissect_jabber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
 	line = tvb_get_ptr(tvb, offset, linelen);
 
-	if (pinfo->match_port == pinfo->destport)
+	if (pinfo->match_uint == pinfo->destport)
 		is_request = TRUE;
 	else
 		is_request = FALSE;
@@ -136,5 +136,5 @@ proto_reg_handoff_jabber(void)
   xml_handle = find_dissector("xml");
 
   jabber_handle = create_dissector_handle(dissect_jabber, proto_jabber);
-  dissector_add("tcp.port", TCP_PORT_JABBER, jabber_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_JABBER, jabber_handle);
 }
diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c
index 924104948b..285b3f88c1 100644
--- a/epan/dissectors/packet-jmirror.c
+++ b/epan/dissectors/packet-jmirror.c
@@ -214,11 +214,11 @@ proto_reg_handoff_jmirror(void)
 		jmirror_inited = TRUE;
 	} else {
 		/* Unregister from the old UDP port */
-		dissector_delete("udp.port", jmirror_udp_port, jmirror_handle);
+		dissector_delete_uint("udp.port", jmirror_udp_port, jmirror_handle);
 	}
 
 	jmirror_udp_port = global_jmirror_udp_port;
 
 	/* Register as a normal IP dissector with default UDP port 30030 */
-	dissector_add("udp.port", jmirror_udp_port, jmirror_handle);
+	dissector_add_uint("udp.port", jmirror_udp_port, jmirror_handle);
 }
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index 75f5eb7915..6d398b2354 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -278,5 +278,5 @@ proto_reg_handoff_jpeg(void)
 	dissector_handle_t jpeg_handle;
 
 	jpeg_handle = create_dissector_handle(dissect_jpeg, proto_jpeg);
-	dissector_add("rtp.pt", PT_JPEG, jpeg_handle);
+	dissector_add_uint("rtp.pt", PT_JPEG, jpeg_handle);
 }
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index bf827dc779..b71641df50 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -661,10 +661,10 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
   case PROTO_CLNP:
   case PROTO_MPLS_CLNP:
     nlpid = tvb_get_guint8(tvb, offset);
-    if(dissector_try_port(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree))
+    if(dissector_try_uint(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree))
       return 0;
     next_tvb = tvb_new_subset_remaining(tvb, offset+1);
-    if(dissector_try_port(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree))
+    if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree))
       return 0;
     break;
   case PROTO_Q933:
@@ -1482,17 +1482,17 @@ proto_reg_handoff_juniper(void)
   juniper_ggsn_handle = create_dissector_handle(dissect_juniper_ggsn, proto_juniper);
   juniper_vp_handle = create_dissector_handle(dissect_juniper_vp, proto_juniper);
     
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_PPPOE, juniper_pppoe_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_MLPPP, juniper_mlppp_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_MLFR, juniper_mlfr_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ETHER, juniper_ether_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_PPP, juniper_ppp_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_FRELAY, juniper_frelay_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_CHDLC, juniper_chdlc_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_GGSN, juniper_ggsn_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_VP, juniper_vp_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_PPPOE, juniper_pppoe_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_MLPPP, juniper_mlppp_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_MLFR, juniper_mlfr_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ETHER, juniper_ether_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_PPP, juniper_ppp_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_FRELAY, juniper_frelay_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_CHDLC, juniper_chdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_GGSN, juniper_ggsn_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_VP, juniper_vp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 5a75fadc88..5c3c395a09 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -410,7 +410,7 @@ initialize_handles_once(void)
 void proto_reg_handoff_k12(void)
 {
 	initialize_handles_once();
-	dissector_add("wtap_encap", WTAP_ENCAP_K12, k12_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_K12, k12_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index c8e154f01e..b41b17a5ba 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -345,6 +345,6 @@ void
 proto_reg_handoff_kdp(void) {
   dissector_handle_t kdp_handle;
   kdp_handle = create_dissector_handle(dissect_kdp, proto_kdp);
-  dissector_add("udp.port", KDP_PORT, kdp_handle);
+  dissector_add_uint("udp.port", KDP_PORT, kdp_handle);
 }
 
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index e7cedc982a..36a997e72c 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -5503,8 +5503,8 @@ proto_reg_handoff_kerberos(void)
                                                       proto_kerberos);
     kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
                                                   proto_kerberos);
-    dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
-    dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
+    dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
+    dissector_add_uint("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
 
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_CONNECT,
                                       DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 4ed8a46bf7..5819f2dae7 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -455,5 +455,5 @@ proto_reg_handoff_krb4(void)
   dissector_handle_t krb4_handle;
 
   krb4_handle = find_dissector("krb4");
-  dissector_add("udp.port", UDP_PORT_KRB4, krb4_handle);
+  dissector_add_uint("udp.port", UDP_PORT_KRB4, krb4_handle);
 }
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index 762e250600..b7fa7cafe8 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -380,12 +380,12 @@ proto_reg_handoff_kingfisher( void )
     dissector_handle_t kingfisher_handle=NULL;
 
     kingfisher_handle = new_create_dissector_handle(dissect_kingfisher_heur, proto_kingfisher);
-    dissector_add("tcp.port", TCP_PORT_KINGFISHER, kingfisher_handle);
-    dissector_add("udp.port", UDP_PORT_KINGFISHER, kingfisher_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_KINGFISHER, kingfisher_handle);
+    dissector_add_uint("udp.port", UDP_PORT_KINGFISHER, kingfisher_handle);
 
 #ifdef SUPPORT_KINGFISHER_SERIES_2
-    dissector_add("tcp.port", TCP_PORT_KINGFISHER_OLD, kingfisher_handle);
-    dissector_add("udp.port", UDP_PORT_KINGFISHER_OLD, kingfisher_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_KINGFISHER_OLD, kingfisher_handle);
+    dissector_add_uint("udp.port", UDP_PORT_KINGFISHER_OLD, kingfisher_handle);
 #endif
     kingfisher_conv_handle = new_create_dissector_handle(dissect_kingfisher_conv, proto_kingfisher);
 
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index 8182f11ddb..8cf61e684f 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -974,7 +974,7 @@ void proto_reg_handoff_kink(void) {
   
   kink_handle = create_dissector_handle(dissect_kink, proto_kink);
 
-  dissector_add("udp.port", KINK_PORT, kink_handle);
+  dissector_add_uint("udp.port", KINK_PORT, kink_handle);
 
 }
 
diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c
index 3934ffafd9..2d8d02f708 100644
--- a/epan/dissectors/packet-kismet.c
+++ b/epan/dissectors/packet-kismet.c
@@ -106,7 +106,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	/*
 	 * Check if it is request, reply or continuation.
 	 */
-	if (pinfo->match_port == pinfo->destport) {
+	if (pinfo->match_uint == pinfo->destport) {
 		is_request = TRUE;
 		is_continuation = FALSE;
 	} else {
@@ -324,11 +324,11 @@ proto_reg_handoff_kismet(void)
 		data_handle = find_dissector("data");
 		kismet_prefs_initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", tcp_port, kismet_handle);
+		dissector_delete_uint("tcp.port", tcp_port, kismet_handle);
 	}
 
 	/* Set our port number for future use */
 	tcp_port = global_kismet_tcp_port;
 
-	dissector_add("tcp.port", global_kismet_tcp_port, kismet_handle);
+	dissector_add_uint("tcp.port", global_kismet_tcp_port, kismet_handle);
 }
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index c819712da7..34c5cb0c7e 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -353,7 +353,7 @@ proto_reg_handoff_kpasswd(void)
 
 	kpasswd_handle_udp = create_dissector_handle(dissect_kpasswd_udp, proto_kpasswd);
         kpasswd_handle_tcp = create_dissector_handle(dissect_kpasswd_tcp, proto_kpasswd);
-	dissector_add("udp.port", UDP_PORT_KPASSWD, kpasswd_handle_udp);
-        dissector_add("tcp.port", TCP_PORT_KPASSWD, kpasswd_handle_tcp);
+	dissector_add_uint("udp.port", UDP_PORT_KPASSWD, kpasswd_handle_udp);
+        dissector_add_uint("tcp.port", TCP_PORT_KPASSWD, kpasswd_handle_tcp);
 
 }
diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
index f88d7e7e52..e44868ea33 100644
--- a/epan/dissectors/packet-l1-events.c
+++ b/epan/dissectors/packet-l1-events.c
@@ -142,5 +142,5 @@ proto_reg_handoff_l1_events(void)
 	dissector_handle_t l1_events_handle;
 
 	l1_events_handle = find_dissector("data-l1-events");
-        dissector_add("wtap_encap", WTAP_ENCAP_LAYER1_EVENT, l1_events_handle); /* for text msgs from trace files */
+        dissector_add_uint("wtap_encap", WTAP_ENCAP_LAYER1_EVENT, l1_events_handle); /* for text msgs from trace files */
 }
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 799bb7fa8c..4380bbceee 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -2148,10 +2148,10 @@ proto_reg_handoff_l2tp(void)
 	dissector_handle_t l2tp_ip_handle;
 
 	l2tp_udp_handle = new_create_dissector_handle(dissect_l2tp_udp, proto_l2tp);
-	dissector_add("udp.port", UDP_PORT_L2TP, l2tp_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_L2TP, l2tp_udp_handle);
 
 	l2tp_ip_handle = create_dissector_handle(dissect_l2tp_ip, proto_l2tp);
-	dissector_add("ip.proto", IP_PROTO_L2TP, l2tp_ip_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_L2TP, l2tp_ip_handle);
 
 	/*
 	 * Get a handle for the PPP-in-HDLC-like-framing dissector.
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index a56ae360b0..92f16194ae 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -235,5 +235,5 @@ proto_reg_handoff_lapb(void)
     x25_handle = find_dissector("x.25");
 
     lapb_handle = find_dissector("lapb");
-    dissector_add("wtap_encap", WTAP_ENCAP_LAPB, lapb_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_LAPB, lapb_handle);
 }
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index 91c43e2322..cea8f5f37e 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -100,6 +100,6 @@ proto_reg_handoff_lapbether(void)
 
   lapbether_handle = create_dissector_handle(dissect_lapbether,
 					     proto_lapbether);
-  dissector_add("ethertype", ETHERTYPE_DEC, lapbether_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_DEC, lapbether_handle);
 
 }
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index 0c25fb96d2..b55dfd5517 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -530,11 +530,11 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (XDLC_IS_INFORMATION(control)) {
 		/* call next protocol */
 		if(global_lapd_gsm_sapis){
-			if (!dissector_try_port(lapd_gsm_sapi_dissector_table, sapi,
+			if (!dissector_try_uint(lapd_gsm_sapi_dissector_table, sapi,
 				next_tvb, pinfo, tree))
 				call_dissector(data_handle,next_tvb, pinfo, tree);
 		}else{
-			if (!dissector_try_port(lapd_sapi_dissector_table, sapi,
+			if (!dissector_try_uint(lapd_sapi_dissector_table, sapi,
 				next_tvb, pinfo, tree))
 				call_dissector(data_handle,next_tvb, pinfo, tree);
 		}
@@ -694,7 +694,7 @@ proto_reg_handoff_lapd(void)
 		dissector_handle_t lapd_handle;
 
 		lapd_handle = find_dissector("lapd");
-		dissector_add("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle);
+		dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle);
 
 		lapd_bitstream_handle = create_dissector_handle(dissect_lapd_bitstream, proto_lapd);
 		data_handle = find_dissector("data");
@@ -702,11 +702,11 @@ proto_reg_handoff_lapd(void)
 		init = TRUE;
 	} else {
 		if ((lapd_rtp_payload_type > 95) && (lapd_rtp_payload_type < 128))
-			dissector_delete("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle);
+			dissector_delete_uint("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle);
 	}
 
 	lapd_rtp_payload_type = pref_lapd_rtp_payload_type;
 	if ((lapd_rtp_payload_type > 95) && (lapd_rtp_payload_type < 128))
-		dissector_add("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle);
+		dissector_add_uint("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle);
 }
 
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index dbeac85f97..a0f307fcf7 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -309,7 +309,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             /* Reassembled into this packet
              */
             if (fd_m && pinfo->fd->num == fd_m->reassembled_in) {
-                    if (!dissector_try_port(lapdm_sapi_dissector_table, sapi,
+                    if (!dissector_try_uint(lapdm_sapi_dissector_table, sapi,
                                 reassembled, pinfo, tree))
                         call_dissector(data_handle, reassembled, pinfo, tree);
             }
@@ -329,7 +329,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /* Whole packet
            If we have some data, try and dissect it (only happens for UI, SABM, UA or I frames)
          */
-        if (!dissector_try_port(lapdm_sapi_dissector_table, sapi,
+        if (!dissector_try_uint(lapdm_sapi_dissector_table, sapi,
                 payload, pinfo, tree))
             call_dissector(data_handle,payload, pinfo, tree);
     }
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index d30737c67d..2cc06cd6b6 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -244,10 +244,10 @@ proto_reg_handoff_laplink(void)
 
 	laplink_tcp_handle = create_dissector_handle(dissect_laplink_tcp,
 	    proto_laplink);
-	dissector_add("tcp.port", TCP_PORT_LAPLINK, laplink_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_LAPLINK, laplink_tcp_handle);
 
 	laplink_udp_handle = new_create_dissector_handle(dissect_laplink_udp,
 	    proto_laplink);
-	dissector_add("udp.port", UDP_PORT_LAPLINK, laplink_udp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LAPLINK, laplink_udp_handle);
 }
 
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index e0f98257bc..8652827fbb 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -4628,7 +4628,7 @@ this_was_not_normal_ldap:
 	  guint32 old_start_tls_frame;
 
 	  /* temporarily dissect this port as SSL */
-	  dissector_delete("tcp.port", tcp_port, ldap_handle);
+	  dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
 	  ssl_dissector_add(tcp_port, "ldap", TRUE);
 
 	  old_start_tls_frame = ldap_info->start_tls_frame;
@@ -4641,7 +4641,7 @@ this_was_not_normal_ldap:
 	  ssl_dissector_delete(tcp_port, "ldap", TRUE);
 
 	  /* restore ldap as the dissector for this port */
-	  dissector_add("tcp.port", tcp_port, ldap_handle);
+	  dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
 	  /* we are done */
 	  return;
@@ -5651,10 +5651,10 @@ proto_reg_handoff_ldap(void)
 	dissector_handle_t cldap_handle;
 	ldap_handle = find_dissector("ldap");
 
-	dissector_add("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
 
 	cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
-	dissector_add("udp.port", UDP_PORT_CLDAP, cldap_handle);
+	dissector_add_uint("udp.port", UDP_PORT_CLDAP, cldap_handle);
 
 	gssapi_handle = find_dissector("gssapi");
 	gssapi_wrap_handle = find_dissector("gssapi_verf");
@@ -5743,13 +5743,13 @@ prefs_register_ldap(void)
 
   if(tcp_port != global_ldap_tcp_port) {
     if(tcp_port)
-      dissector_delete("tcp.port", tcp_port, ldap_handle);
+      dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
 
     /* Set our port number for future use */
     tcp_port = global_ldap_tcp_port;
 
     if(tcp_port)
-      dissector_add("tcp.port", tcp_port, ldap_handle);
+      dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
   }
 
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 12d21dbffe..1fb2e36204 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -3971,8 +3971,8 @@ proto_reg_handoff_ldp(void)
     }
     else {
 
-        dissector_delete("tcp.port", tcp_port, ldp_tcp_handle);
-        dissector_delete("udp.port", udp_port, ldp_handle);
+        dissector_delete_uint("tcp.port", tcp_port, ldp_tcp_handle);
+        dissector_delete_uint("udp.port", udp_port, ldp_handle);
 
     }
 
@@ -3981,7 +3981,7 @@ proto_reg_handoff_ldp(void)
     tcp_port = global_ldp_tcp_port;
     udp_port = global_ldp_udp_port;
 
-    dissector_add("tcp.port", global_ldp_tcp_port, ldp_tcp_handle);
-    dissector_add("udp.port", global_ldp_udp_port, ldp_handle);
+    dissector_add_uint("tcp.port", global_ldp_tcp_port, ldp_tcp_handle);
+    dissector_add_uint("udp.port", global_ldp_udp_port, ldp_handle);
 
 }
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 1b7ab8bede..e01feeabcc 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -1006,8 +1006,8 @@ proto_reg_handoff_ldss (void)
 		ldss_initialized = TRUE;
 	}
 	else {
-		dissector_delete("udp.port", saved_udp_port_ldss, ldss_handle);
+		dissector_delete_uint("udp.port", saved_udp_port_ldss, ldss_handle);
 	}
-	dissector_add("udp.port", global_udp_port_ldss, ldss_handle);
+	dissector_add_uint("udp.port", global_udp_port_ldss, ldss_handle);
 	saved_udp_port_ldss = global_udp_port_ldss;
 }
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index 771c171e4e..f4c885d64b 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -137,12 +137,12 @@ proto_reg_handoff_lge_monitor(void)
 	  }
 	else {
 		if (saved_udp_port != 0) {
-			dissector_delete("udp.port", saved_udp_port, lge_monitor_handle);
+			dissector_delete_uint("udp.port", saved_udp_port, lge_monitor_handle);
 		}
 	}
 
 	if (LGEMonitorUDPPort != 0) {
-		dissector_add("udp.port", LGEMonitorUDPPort, lge_monitor_handle);
+		dissector_add_uint("udp.port", LGEMonitorUDPPort, lge_monitor_handle);
 	}
 	saved_udp_port = LGEMonitorUDPPort;
 }
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index 6821fe211b..8998966917 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -738,6 +738,6 @@ proto_reg_handoff_linx(void)
 	dissector_handle_t linx_handle;
 
 	linx_handle = create_dissector_handle(dissect_linx, proto_linx);
-	dissector_add("ethertype", ETHERTYPE_LINX, linx_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_LINX, linx_handle);
 }
 
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index ab9ef3682d..cc21be1050 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -535,7 +535,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				 * Try the regular LLC subdissector table
 				 * with the DSAP.
 				 */
-				if (!dissector_try_port(dsap_subdissector_table,
+				if (!dissector_try_uint(dsap_subdissector_table,
 				    dsap, next_tvb, pinfo, tree)) {
 					call_dissector(data_handle, next_tvb,
 					    pinfo, tree);
@@ -554,7 +554,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				 * Try the XID LLC subdissector table
 				 * with the DSAP.
 				 */
-				    if (!dissector_try_port(
+				    if (!dissector_try_uint(
 					xid_subdissector_table, dsap, next_tvb,
 					pinfo, tree)) {
 					    call_dissector(data_handle,
@@ -609,7 +609,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 		proto_tree_add_uint(snap_tree, hf, tvb, offset+3, 2, etype);
 		next_tvb = tvb_new_subset_remaining(tvb, offset+5);
 
-		if(!dissector_try_port(hpteam_subdissector_table,etype, next_tvb, pinfo, tree))
+		if(!dissector_try_uint(hpteam_subdissector_table,etype, next_tvb, pinfo, tree))
 	 		call_dissector(data_handle, next_tvb, pinfo, tree);
 		break;
 
@@ -629,7 +629,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 				    tvb, offset+3, 2, etype);
 			}
 			next_tvb = tvb_new_subset_remaining(tvb, offset+5);
-			if (!dissector_try_port(ethertype_subdissector_table,
+			if (!dissector_try_uint(ethertype_subdissector_table,
 			    etype, next_tvb, pinfo, tree))
 				call_dissector(data_handle, next_tvb, pinfo,
 				    tree);
@@ -727,7 +727,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 			mesh_header_len = call_dissector(mesh_handle,
 			    next_tvb, pinfo, tree);
 			next_tvb = tvb_new_subset_remaining(tvb, offset+5+mesh_header_len);
-			if (!dissector_try_port(ethertype_subdissector_table,
+			if (!dissector_try_uint(ethertype_subdissector_table,
 			    etype, next_tvb, pinfo, tree))
 				call_dissector(data_handle, next_tvb, pinfo,
 				    tree);
@@ -764,7 +764,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 		if (XDLC_IS_INFORMATION(control)) {
 			if (subdissector_table != NULL) {
 				/* do lookup with the subdissector table */
-				if (dissector_try_port(subdissector_table,
+				if (dissector_try_uint(subdissector_table,
 				    etype, next_tvb, pinfo, tree))
 					break;
 			}
@@ -954,25 +954,25 @@ proto_reg_handoff_llc(void)
 	hpteam_subdissector_table = find_dissector_table("llc.hpteam_pid");
 
 	llc_handle = find_dissector("llc");
-	dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
-	dissector_add("sll.ltype", LINUX_SLL_P_802_2, llc_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
+	dissector_add_uint("sll.ltype", LINUX_SLL_P_802_2, llc_handle);
 	/* RFC 2043 */
-	dissector_add("ppp.protocol", PPP_LLC, llc_handle);
+	dissector_add_uint("ppp.protocol", PPP_LLC, llc_handle);
 	/* RFC 2353 */
-	dissector_add("udp.port", UDP_PORT_LLC1, llc_handle);
-	dissector_add("udp.port", UDP_PORT_LLC2, llc_handle);
-	dissector_add("udp.port", UDP_PORT_LLC3, llc_handle);
-	dissector_add("udp.port", UDP_PORT_LLC4, llc_handle);
-	dissector_add("udp.port", UDP_PORT_LLC5, llc_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LLC1, llc_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LLC2, llc_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LLC3, llc_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LLC4, llc_handle);
+	dissector_add_uint("udp.port", UDP_PORT_LLC5, llc_handle);
 	/* IP-over-FC when we have the full FC frame */
-	dissector_add("fc.ftype", FC_FTYPE_IP, llc_handle);
+	dissector_add_uint("fc.ftype", FC_FTYPE_IP, llc_handle);
 
 	/*
 	 * BACNET-over-ARCNET is really BACNET-over-802.2 LLC-over-ARCNET,
 	 * apparently.
 	 */
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_BACNET, llc_handle);
-	dissector_add("ethertype", ETHERTYPE_JUMBO_LLC, llc_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_BACNET, llc_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_JUMBO_LLC, llc_handle);
 
 	/*
 	 * Register all the fields for PIDs for various OUIs.
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index dbf6fe025f..f38f464bf8 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -2859,5 +2859,5 @@ proto_reg_handoff_lldp(void)
 	dissector_handle_t lldp_handle;
 
 	lldp_handle = create_dissector_handle(dissect_lldp,proto_lldp);
-	dissector_add("ethertype", ETHERTYPE_LLDP, lldp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_LLDP, lldp_handle);
 }
diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c
index 5af5fbc8b3..9fd9117f4f 100644
--- a/epan/dissectors/packet-llt.c
+++ b/epan/dissectors/packet-llt.c
@@ -150,11 +150,11 @@ proto_reg_handoff_llt(void)
 
 	if (!initialized) {
 		llt_handle = create_dissector_handle(dissect_llt, proto_llt);
-		dissector_add("ethertype", ETHERTYPE_LLT, llt_handle);
+		dissector_add_uint("ethertype", ETHERTYPE_LLT, llt_handle);
 		initialized = TRUE;
 	} else {
 		if (preference_alternate_ethertype_last != 0x0) {
-			dissector_delete("ethertype", preference_alternate_ethertype_last, llt_handle);
+			dissector_delete_uint("ethertype", preference_alternate_ethertype_last, llt_handle);
 		}
 	}
 
@@ -163,6 +163,6 @@ proto_reg_handoff_llt(void)
 
 	if (preference_alternate_ethertype != 0x0) {
  		/* Register the new ethertype setting */
-		dissector_add("ethertype", preference_alternate_ethertype, llt_handle);
+		dissector_add_uint("ethertype", preference_alternate_ethertype, llt_handle);
 	}
 }
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 24d0ccd277..95d6cb195c 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -248,5 +248,5 @@ proto_reg_handoff_lmi(void)
 	dissector_handle_t lmi_handle;
 
 	lmi_handle = create_dissector_handle(dissect_lmi, proto_lmi);
-	dissector_add("fr.ietf", NLPID_LMI, lmi_handle);
+	dissector_add_uint("fr.ietf", NLPID_LMI, lmi_handle);
 }
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 74f9d5d49c..40416f1c9d 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -2017,9 +2017,9 @@ static void
 lmp_prefs_applied (void)
 {
     if (lmp_udp_port != lmp_udp_port_config) {
-	dissector_delete("udp.port", lmp_udp_port, lmp_handle);
+	dissector_delete_uint("udp.port", lmp_udp_port, lmp_handle);
 	lmp_udp_port = lmp_udp_port_config;
-	dissector_add("udp.port", lmp_udp_port, lmp_handle);
+	dissector_add_uint("udp.port", lmp_udp_port, lmp_handle);
     }
 }
 
@@ -2709,5 +2709,5 @@ void
 proto_reg_handoff_lmp(void)
 {
     lmp_handle = new_create_dissector_handle(dissect_lmp, proto_lmp);
-    dissector_add("udp.port", lmp_udp_port, lmp_handle);
+    dissector_add_uint("udp.port", lmp_udp_port, lmp_handle);
 }
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index 485fc75260..eda993140b 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -167,7 +167,7 @@ proto_reg_handoff_loop(void)
 
   loop_handle = create_dissector_handle(dissect_loop, proto_loop);
 
-  dissector_add("ethertype", ETHERTYPE_LOOP, loop_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_LOOP, loop_handle);
 
   data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index ca9a7efb09..95de019007 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -189,6 +189,6 @@ proto_reg_handoff_lpd(void)
   dissector_handle_t lpd_handle;
 
   lpd_handle = create_dissector_handle(dissect_lpd, proto_lpd);
-  dissector_add("tcp.port", TCP_PORT_PRINTER, lpd_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_PRINTER, lpd_handle);
   data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 8c7a151e02..c578022d48 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -447,15 +447,15 @@ proto_reg_handoff_lsc(void)
     initialized = TRUE;
   } else {
     if (saved_lsc_port != 0) {
-      dissector_delete("udp.port", saved_lsc_port, lsc_udp_handle);
-      dissector_delete("tcp.port", saved_lsc_port, lsc_tcp_handle);
+      dissector_delete_uint("udp.port", saved_lsc_port, lsc_udp_handle);
+      dissector_delete_uint("tcp.port", saved_lsc_port, lsc_tcp_handle);
     }
   }
 
   /* Set the port number */
   if (global_lsc_port != 0) {
-    dissector_add("udp.port", global_lsc_port, lsc_udp_handle);
-    dissector_add("tcp.port", global_lsc_port, lsc_tcp_handle);
+    dissector_add_uint("udp.port", global_lsc_port, lsc_udp_handle);
+    dissector_add_uint("tcp.port", global_lsc_port, lsc_tcp_handle);
   }
   saved_lsc_port = global_lsc_port;
 }
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c
index b6c1bd4d77..08b192c264 100644
--- a/epan/dissectors/packet-ltp.c
+++ b/epan/dissectors/packet-ltp.c
@@ -1004,10 +1004,10 @@ proto_reg_handoff_ltp(void)
 		ltp_handle = new_create_dissector_handle(dissect_ltp, proto_ltp);
 		initialized = TRUE;
 	} else {
-		dissector_delete("udp.port", currentPort, ltp_handle);
+		dissector_delete_uint("udp.port", currentPort, ltp_handle);
 	}
 
 	currentPort = ltp_port;
 
-	dissector_add("udp.port", currentPort, ltp_handle);
+	dissector_add_uint("udp.port", currentPort, ltp_handle);
 }
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index 5f6505fd93..fb37e542dc 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -581,14 +581,14 @@ proto_reg_handoff_lwapp(void)
 
     /* Obsoleted LWAPP via encapsulated 802.3 over UDP */
 
-    dissector_add("udp.port", 12220, lwapp_l3_handle);
+    dissector_add_uint("udp.port", 12220, lwapp_l3_handle);
 
     /* new-style lwapp directly over UDP: L3-lwapp*/
-    dissector_add("udp.port", 12222, lwapp_handle);
-    dissector_add("udp.port", 12223, lwapp_handle);
+    dissector_add_uint("udp.port", 12222, lwapp_handle);
+    dissector_add_uint("udp.port", 12223, lwapp_handle);
 
     /* Lwapp over L2 */
-    dissector_add("ethertype", 0x88bb, lwapp_handle);
-    dissector_add("ethertype", 0xbbbb, lwapp_handle);
+    dissector_add_uint("ethertype", 0x88bb, lwapp_handle);
+    dissector_add_uint("ethertype", 0xbbbb, lwapp_handle);
 
 }
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index e2a3fc1153..5cb9422dc9 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -1297,10 +1297,10 @@ proto_reg_handoff_lwres(void)
     lwres_prefs_initialized = TRUE;
   }
   else {
-    dissector_delete("udp.port", lwres_port, lwres_handle);
+    dissector_delete_uint("udp.port", lwres_port, lwres_handle);
   }
 
-  dissector_add("udp.port", global_lwres_port, lwres_handle);
+  dissector_add_uint("udp.port", global_lwres_port, lwres_handle);
   lwres_port = global_lwres_port;
 
 }
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index d545439c76..ba0b01ff9a 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -618,18 +618,18 @@ proto_reg_handoff_m2pa(void)
     m2pa_handle   = find_dissector("m2pa");
     mtp3_handle   = find_dissector("mtp3");
 
-    dissector_add("sctp.ppi", M2PA_PAYLOAD_PROTOCOL_ID, m2pa_handle);
+    dissector_add_uint("sctp.ppi", M2PA_PAYLOAD_PROTOCOL_ID, m2pa_handle);
 
     prefs_initialized = TRUE;
 
   } else {
 
-    dissector_delete("sctp.port", sctp_port, m2pa_handle);
+    dissector_delete_uint("sctp.port", sctp_port, m2pa_handle);
 
   }
 
   /* Set our port number for future use */
   sctp_port = global_sctp_port;
 
-  dissector_add("sctp.port", sctp_port, m2pa_handle);
+  dissector_add_uint("sctp.port", sctp_port, m2pa_handle);
 }
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index 381b663d31..98e543d824 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -669,6 +669,6 @@ proto_reg_handoff_m2tp(void)
   dissector_handle_t m2tp_handle;
   mtp2_handle   = find_dissector("mtp2");
   m2tp_handle   = create_dissector_handle(dissect_m2tp, proto_m2tp);
-  dissector_add("sctp.ppi",  M2TP_PAYLOAD_PROTOCOL_ID, m2tp_handle);
-  dissector_add("sctp.port", SCTP_PORT_M2TP, m2tp_handle);
+  dissector_add_uint("sctp.ppi",  M2TP_PAYLOAD_PROTOCOL_ID, m2tp_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_M2TP, m2tp_handle);
 }
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index b6ef4f5217..1079f4a399 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -1153,6 +1153,6 @@ proto_reg_handoff_m2ua(void)
 
   mtp3_handle = find_dissector("mtp3");
   m2ua_handle = create_dissector_handle(dissect_m2ua, proto_m2ua);
-  dissector_add("sctp.ppi",  M2UA_PAYLOAD_PROTOCOL_ID, m2ua_handle);
-  dissector_add("sctp.port", SCTP_PORT_M2UA, m2ua_handle);
+  dissector_add_uint("sctp.ppi",  M2UA_PAYLOAD_PROTOCOL_ID, m2ua_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_M2UA, m2ua_handle);
 }
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index a4bb20ad8e..ae162f8a65 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -1192,7 +1192,7 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro
   }
 
   payload_tvb = tvb_new_subset(parameter_tvb, DATA_ULP_OFFSET, ulp_length, ulp_length);
-  if (!dissector_try_port(si_dissector_table, tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET), payload_tvb, pinfo, tree))
+  if (!dissector_try_uint(si_dissector_table, tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET), payload_tvb, pinfo, tree))
     call_dissector(data_handle, payload_tvb, pinfo, tree);
 }
 
@@ -2096,8 +2096,8 @@ proto_reg_handoff_m3ua(void)
   mtp3_handle = find_dissector("mtp3");
   data_handle = find_dissector("data");
   m3ua_handle = find_dissector("m3ua");
-  dissector_add("sctp.ppi",  M3UA_PAYLOAD_PROTOCOL_ID, m3ua_handle);
-  dissector_add("sctp.port", SCTP_PORT_M3UA, m3ua_handle);
+  dissector_add_uint("sctp.ppi",  M3UA_PAYLOAD_PROTOCOL_ID, m3ua_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_M3UA, m3ua_handle);
 
   si_dissector_table = find_dissector_table("mtp3.service_indicator");
 }
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index fb32e06a5f..f9c654df23 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -243,5 +243,5 @@ proto_reg_handoff_macctrl(void)
   dissector_handle_t macctrl_handle;
 
   macctrl_handle = create_dissector_handle(dissect_macctrl, proto_macctrl);
-  dissector_add("ethertype", ETHERTYPE_MAC_CONTROL, macctrl_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_MAC_CONTROL, macctrl_handle);
 }
diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c
index 101fc4107c..91f4a12302 100644
--- a/epan/dissectors/packet-mactelnet.c
+++ b/epan/dissectors/packet-mactelnet.c
@@ -338,9 +338,9 @@ proto_reg_handoff_mactelnet(void)
 		data_handle = find_dissector("data");
 		initialized = TRUE;
 	} else {
-		dissector_delete("udp.port", current_port, mactelnet_handle);
+		dissector_delete_uint("udp.port", current_port, mactelnet_handle);
 	}
 
 	current_port = global_mactelnet_port;
-	dissector_add("udp.port", current_port, mactelnet_handle);
+	dissector_add_uint("udp.port", current_port, mactelnet_handle);
 }
diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c
index b155ff04b2..04f999b49b 100644
--- a/epan/dissectors/packet-manolito.c
+++ b/epan/dissectors/packet-manolito.c
@@ -291,6 +291,6 @@ proto_reg_handoff_manolito(void)
 
 	manolito_handle = create_dissector_handle(dissect_manolito,
 	    proto_manolito);
-	dissector_add("udp.port", 41170, manolito_handle);
+	dissector_add_uint("udp.port", 41170, manolito_handle);
 }
 
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index 5d058bf1c5..904b1cc4cd 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -711,6 +711,6 @@ proto_reg_handoff_mbtcp(void)
 	dissector_handle_t mbtcp_handle;
 
 	mbtcp_handle = new_create_dissector_handle(dissect_mbtcp, proto_mbtcp);
-	dissector_add("tcp.port", PORT_MBTCP, mbtcp_handle);
-	dissector_add("udp.port", PORT_MBTCP, mbtcp_handle);
+	dissector_add_uint("tcp.port", PORT_MBTCP, mbtcp_handle);
+	dissector_add_uint("udp.port", PORT_MBTCP, mbtcp_handle);
 }
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index cc3e56ff56..a2963b1086 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -356,7 +356,7 @@ proto_reg_handoff_mdshdr(void)
          * Channel handles.
          */
         mdshdr_handle = create_dissector_handle (dissect_mdshdr, proto_mdshdr);
-        dissector_add ("ethertype", ETHERTYPE_FCFT, mdshdr_handle);
+        dissector_add_uint ("ethertype", ETHERTYPE_FCFT, mdshdr_handle);
         data_handle = find_dissector ("data");
         fc_dissector_handle = find_dissector ("fc");
         mdshdr_prefs_initialized = TRUE;
@@ -373,7 +373,7 @@ proto_reg_handoff_mdshdr(void)
          * do so.
          */
         if (!registered_for_zero_etype) {
-            dissector_add ("ethertype", ETHERTYPE_UNK, mdshdr_handle);
+            dissector_add_uint ("ethertype", ETHERTYPE_UNK, mdshdr_handle);
             registered_for_zero_etype = TRUE;
         }
     } else {
@@ -383,7 +383,7 @@ proto_reg_handoff_mdshdr(void)
          * undo that registration.
          */
         if (registered_for_zero_etype) {
-            dissector_delete ("ethertype", ETHERTYPE_UNK, mdshdr_handle);
+            dissector_delete_uint ("ethertype", ETHERTYPE_UNK, mdshdr_handle);
             registered_for_zero_etype = FALSE;
         }
     }
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index f514e0abff..c9466f40c7 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -3376,13 +3376,13 @@ proto_reg_handoff_megaco(void)
 		megaco_text_handle = find_dissector("megaco");
 		megaco_text_tcp_handle = create_dissector_handle(dissect_megaco_text_tcp, proto_megaco);
 
-		dissector_add("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID,   megaco_text_handle);
+		dissector_add_uint("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID,   megaco_text_handle);
 
 		megaco_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", txt_tcp_port, megaco_text_tcp_handle);
-		dissector_delete("udp.port", txt_udp_port, megaco_text_handle);
+		dissector_delete_uint("tcp.port", txt_tcp_port, megaco_text_tcp_handle);
+		dissector_delete_uint("udp.port", txt_udp_port, megaco_text_handle);
 	}
 
 	/* Set our port number for future use */
@@ -3390,8 +3390,8 @@ proto_reg_handoff_megaco(void)
 	txt_tcp_port = global_megaco_txt_tcp_port;
 	txt_udp_port = global_megaco_txt_udp_port;
 
-	dissector_add("tcp.port", global_megaco_txt_tcp_port, megaco_text_tcp_handle);
-	dissector_add("udp.port", global_megaco_txt_udp_port, megaco_text_handle);
+	dissector_add_uint("tcp.port", global_megaco_txt_tcp_port, megaco_text_tcp_handle);
+	dissector_add_uint("udp.port", global_megaco_txt_udp_port, megaco_text_handle);
 
 }
 
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 512b55b6c2..57a638b5b0 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -2168,8 +2168,8 @@ proto_reg_handoff_memcache (void)
   memcache_tcp_handle = find_dissector ("memcache.tcp");
   memcache_udp_handle = find_dissector ("memcache.udp");
 
-  dissector_add ("tcp.port", MEMCACHE_PORT, memcache_tcp_handle);
-  dissector_add ("udp.port", MEMCACHE_PORT, memcache_udp_handle);
+  dissector_add_uint ("tcp.port", MEMCACHE_PORT, memcache_tcp_handle);
+  dissector_add_uint ("udp.port", MEMCACHE_PORT, memcache_udp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index c69a2a5792..f62a24d34e 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -510,7 +510,7 @@ proto_reg_handoff_meta(void)
 	dissector_handle_t meta_handle;
 	meta_handle = find_dissector("meta");
 	/* enable once WTAP_ENCAP_META exists
-	dissector_add("wtap_encap", WTAP_ENCAP_META, meta_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_META, meta_handle);
 	*/
 
 	data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index ad1e7605b2..d9f07c702a 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -934,10 +934,10 @@ void proto_reg_handoff_mgcp(void)
 	}
 	else
 	{
-		dissector_delete("tcp.port", gateway_tcp_port, mgcp_tpkt_handle);
-		dissector_delete("udp.port", gateway_udp_port, mgcp_handle);
-		dissector_delete("tcp.port", callagent_tcp_port, mgcp_tpkt_handle);
-		dissector_delete("udp.port", callagent_udp_port, mgcp_handle);
+		dissector_delete_uint("tcp.port", gateway_tcp_port, mgcp_tpkt_handle);
+		dissector_delete_uint("udp.port", gateway_udp_port, mgcp_handle);
+		dissector_delete_uint("tcp.port", callagent_tcp_port, mgcp_tpkt_handle);
+		dissector_delete_uint("udp.port", callagent_udp_port, mgcp_handle);
 	}
 
 	/* Set our port number for future use */
@@ -947,10 +947,10 @@ void proto_reg_handoff_mgcp(void)
 	callagent_tcp_port = global_mgcp_callagent_tcp_port;
 	callagent_udp_port = global_mgcp_callagent_udp_port;
 
-	dissector_add("tcp.port", global_mgcp_gateway_tcp_port, mgcp_tpkt_handle);
-	dissector_add("udp.port", global_mgcp_gateway_udp_port, mgcp_handle);
-	dissector_add("tcp.port", global_mgcp_callagent_tcp_port, mgcp_tpkt_handle);
-	dissector_add("udp.port", global_mgcp_callagent_udp_port, mgcp_handle);
+	dissector_add_uint("tcp.port", global_mgcp_gateway_tcp_port, mgcp_tpkt_handle);
+	dissector_add_uint("udp.port", global_mgcp_gateway_udp_port, mgcp_handle);
+	dissector_add_uint("tcp.port", global_mgcp_callagent_tcp_port, mgcp_tpkt_handle);
+	dissector_add_uint("udp.port", global_mgcp_callagent_udp_port, mgcp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index 9d26c65811..a2cd559427 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -1800,12 +1800,12 @@ proto_reg_handoff_mikey(void)
 		dissector_add_string("key_mgmt", "mikey", mikey_handle);
 		inited = TRUE;
 	} else {
-		dissector_delete("udp.port", mikey_udp_port, mikey_handle);
-		dissector_delete("tcp.port", mikey_tcp_port, mikey_handle);
+		dissector_delete_uint("udp.port", mikey_udp_port, mikey_handle);
+		dissector_delete_uint("tcp.port", mikey_tcp_port, mikey_handle);
 	}
 
-	dissector_add("udp.port", global_mikey_udp_port, mikey_handle);
-	dissector_add("tcp.port", global_mikey_tcp_port, mikey_handle);
+	dissector_add_uint("udp.port", global_mikey_udp_port, mikey_handle);
+	dissector_add_uint("tcp.port", global_mikey_tcp_port, mikey_handle);
 
 	mikey_udp_port = global_mikey_udp_port;
 	mikey_tcp_port = global_mikey_tcp_port;
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 639cbd1cad..ec1a925614 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -1278,7 +1278,7 @@ proto_reg_handoff_mip(void)
 
 	mip_handle = find_dissector("mip");
 	ip_handle = find_dissector("ip");
-	dissector_add("udp.port", UDP_PORT_MIP, mip_handle);
+	dissector_add_uint("udp.port", UDP_PORT_MIP, mip_handle);
 }
 
 
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 94697e68f1..594bd398bc 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -1877,7 +1877,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ipv6_tvb = tvb_new_subset_remaining(tvb, len + 8);
 
 		/* Call the IPv6 dissector */
-		dissector_try_port(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
+		dissector_try_uint(ip_dissector_table, pproto, ipv6_tvb, pinfo, tree);
 
 		col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement[Fast Binding Update]");
 	}
@@ -2206,7 +2206,7 @@ proto_reg_handoff_mip6(void)
 
 	/* mip6_handle = find_dissector("mipv6"); */
 	mip6_handle = create_dissector_handle(dissect_mip6, proto_mip6);
-	dissector_add("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle);
-	dissector_add("ip.proto", IP_PROTO_MIPV6, mip6_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_MIPV6, mip6_handle);
 	ip_dissector_table = find_dissector_table("ip.proto");
 }
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index 2a1179f0fc..9dab535eaf 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -657,11 +657,11 @@ proto_reg_handoff_mongo(void)
 	} else {
 
 
-		dissector_delete("tcp.port", currentPort, mongo_handle);
+		dissector_delete_uint("tcp.port", currentPort, mongo_handle);
 	}
 
 	currentPort = global_mongo_tcp_port;
 
-	dissector_add("tcp.port", currentPort, mongo_handle);
+	dissector_add_uint("tcp.port", currentPort, mongo_handle);
 
 }
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 6ed0cfcc89..4d22cc3e8d 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -1350,7 +1350,7 @@ proto_reg_handoff_mp2t(void)
 	heur_dissector_add("udp", heur_dissect_mp2t, proto_mp2t);
 
 	mp2t_handle = create_dissector_handle(dissect_mp2t, proto_mp2t);
-	dissector_add("rtp.pt", PT_MP2T, mp2t_handle);
+	dissector_add_uint("rtp.pt", PT_MP2T, mp2t_handle);
 	dissector_add_handle("udp.port", mp2t_handle);  /* for decode-as */
 
 	pes_handle = find_dissector("mpeg-pes");
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index a3cfe0d515..d087a5165a 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -1023,12 +1023,12 @@ proto_reg_handoff_mp4ves(void)
 		}
 	}else{
 		if ( dynamic_payload_type > 95 )
-			dissector_delete("rtp.pt", dynamic_payload_type, mp4ves_handle);
+			dissector_delete_uint("rtp.pt", dynamic_payload_type, mp4ves_handle);
 	}
 	dynamic_payload_type = global_dynamic_payload_type;
 
 	if ( dynamic_payload_type > 95 ){
-		dissector_add("rtp.pt", dynamic_payload_type, mp4ves_handle);
+		dissector_add_uint("rtp.pt", dynamic_payload_type, mp4ves_handle);
 	}
 }
 
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index dd8153b86f..710634dd58 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -1365,6 +1365,6 @@ proto_reg_handoff_mpeg_pes(void)
 {
 	dissector_handle_t mpeg_handle = find_dissector("mpeg");
 
-	dissector_add("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
 	heur_dissector_add("mpeg", dissect_mpeg_pes, proto_mpeg_pes);
 }
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index 445edc05b2..feba11d52c 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -381,5 +381,5 @@ proto_reg_handoff_mpeg1(void)
 	dissector_handle_t mpeg1_handle;
 
 	mpeg1_handle = create_dissector_handle(dissect_mpeg1, proto_mpg);
-	dissector_add("rtp.pt", PT_MPV, mpeg1_handle);
+	dissector_add_uint("rtp.pt", PT_MPV, mpeg1_handle);
 }
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 5de090e415..7026c8df7c 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -1480,9 +1480,9 @@ proto_reg_handoff_mpls_echo(void)
                 proto_mpls_echo);
             mpls_echo_prefs_initialized = TRUE;
         } else {
-            dissector_delete("udp.port", mpls_echo_udp_port, mpls_echo_handle);
+            dissector_delete_uint("udp.port", mpls_echo_udp_port, mpls_echo_handle);
         }
 
         mpls_echo_udp_port = global_mpls_echo_udp_port;
-        dissector_add("udp.port", global_mpls_echo_udp_port, mpls_echo_handle);
+        dissector_add_uint("udp.port", global_mpls_echo_udp_port, mpls_echo_handle);
 }
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 4e83dfcbe3..07448736cc 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -411,7 +411,7 @@ dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /* XXX perhaps this code should be reconsidered */
         /* non-standard extension, therefore controlled by option*/
         /* appeared in revision 10862 from Carlos M. Pignataro */
-        if (!dissector_try_port(ppp_subdissector_table, channel_type,
+        if (!dissector_try_uint(ppp_subdissector_table, channel_type,
                             next_tvb, pinfo, tree)) {
             call_dissector(dissector_data, next_tvb, pinfo, tree);
         }
@@ -764,7 +764,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
 
-    if ( !dissector_try_port(mpls_subdissector_table, label, next_tvb, pinfo, tree))
+    if ( !dissector_try_uint(mpls_subdissector_table, label, next_tvb, pinfo, tree))
     {
         switch ( mpls_default_payload )
         {
@@ -973,18 +973,18 @@ proto_reg_handoff_mpls(void)
 		ppp_subdissector_table = find_dissector_table("ppp.protocol");
 
 		mpls_handle = find_dissector("mpls");
-		dissector_add("ethertype", ETHERTYPE_MPLS, mpls_handle);
-		dissector_add("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle);
-		dissector_add("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
-		dissector_add("ppp.protocol", PPP_MPLS_MULTI, mpls_handle);
-		dissector_add("chdlctype", ETHERTYPE_MPLS, mpls_handle);
-		dissector_add("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle);
-		dissector_add("gre.proto", ETHERTYPE_MPLS, mpls_handle);
-		dissector_add("gre.proto", ETHERTYPE_MPLS_MULTI, mpls_handle);
-		dissector_add("ip.proto", IP_PROTO_MPLS_IN_IP, mpls_handle);
+		dissector_add_uint("ethertype", ETHERTYPE_MPLS, mpls_handle);
+		dissector_add_uint("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle);
+		dissector_add_uint("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
+		dissector_add_uint("ppp.protocol", PPP_MPLS_MULTI, mpls_handle);
+		dissector_add_uint("chdlctype", ETHERTYPE_MPLS, mpls_handle);
+		dissector_add_uint("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle);
+		dissector_add_uint("gre.proto", ETHERTYPE_MPLS, mpls_handle);
+		dissector_add_uint("gre.proto", ETHERTYPE_MPLS_MULTI, mpls_handle);
+		dissector_add_uint("ip.proto", IP_PROTO_MPLS_IN_IP, mpls_handle);
 
 		mpls_handle = find_dissector("mplspwcw");
-		dissector_add( "mpls.label", LABEL_INVALID, mpls_handle );
+		dissector_add_uint( "mpls.label", LABEL_INVALID, mpls_handle );
 
 		dissector_data 			= find_dissector("data");
 		dissector_ipv6 			= find_dissector("ipv6");
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 8e0482ae63..f0e0598b61 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -3274,7 +3274,7 @@ proto_reg_handoff_mq(void)
 	heur_dissector_add("tcp", dissect_mq_heur_tcp, proto_mq);
 	heur_dissector_add("netbios", dissect_mq_heur_netbios, proto_mq);
 	heur_dissector_add("http", dissect_mq_heur_http, proto_mq);
-	dissector_add("spx.socket", MQ_SOCKET_SPX, mq_spx_handle);
+	dissector_add_uint("spx.socket", MQ_SOCKET_SPX, mq_spx_handle);
 	data_handle = find_dissector("data");
 
 }
diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c
index dfbe4248d0..04792a1f9b 100644
--- a/epan/dissectors/packet-mrp-msrp.c
+++ b/epan/dissectors/packet-mrp-msrp.c
@@ -778,5 +778,5 @@ proto_reg_handoff_mrp_msrp(void)
     dissector_handle_t msrp_handle;
 
     msrp_handle = create_dissector_handle(dissect_msrp, proto_msrp);
-    dissector_add("ethertype", ETHERTYPE_MSRP, msrp_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_MSRP, msrp_handle);
 }
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 68e0c32ae3..1fa427219d 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -1941,8 +1941,8 @@ void proto_reg_handoff_msmms_command(void)
 {
     msmms_handle = find_dissector("msmms");
     /* Control commands using TCP port */
-    dissector_add("tcp.port", MSMMS_PORT, msmms_handle);
+    dissector_add_uint("tcp.port", MSMMS_PORT, msmms_handle);
     /* Data command(s) using UDP port */
-    dissector_add("udp.port", MSMMS_PORT, msmms_handle);
+    dissector_add_uint("udp.port", MSMMS_PORT, msmms_handle);
 }
 
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 0efab0f040..c8cb57b87d 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -570,7 +570,7 @@ proto_reg_handoff_msdp(void)
 	dissector_handle_t msdp_handle;
 
 	msdp_handle = create_dissector_handle(dissect_msdp, proto_msdp);
-        dissector_add("tcp.port", 639, msdp_handle);
+        dissector_add_uint("tcp.port", 639, msdp_handle);
 
         ip_handle = find_dissector("ip");
 
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index b5b647a475..deb603b484 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -138,7 +138,7 @@ proto_reg_handoff_msnms(void)
   dissector_handle_t msnms_handle;
 
   msnms_handle = create_dissector_handle(dissect_msnms, proto_msnms);
-  dissector_add("tcp.port", TCP_PORT_MSNMS, msnms_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_MSNMS, msnms_handle);
   /*
    * For MSN Messenger Protocol over HTTP
    */
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index ac1f6d65c6..95a9475892 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -186,5 +186,5 @@ proto_reg_handoff_msnlb(void)
   dissector_handle_t msnlb_handle;
 
   msnlb_handle = create_dissector_handle(dissect_msnlb, proto_msnlb);
-  dissector_add("ethertype", ETHERTYPE_MS_NLB_HEARTBEAT, msnlb_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_MS_NLB_HEARTBEAT, msnlb_handle);
 }
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 676a97e469..5c4f4e1df1 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -1254,5 +1254,5 @@ proto_reg_handoff_msproxy(void) {
 
 	msproxy_handle = create_dissector_handle(dissect_msproxy,
 	    proto_msproxy);
-	dissector_add("udp.port", UDP_PORT_MSPROXY, msproxy_handle);
+	dissector_add_uint("udp.port", UDP_PORT_MSPROXY, msproxy_handle);
 }
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index ff999e74e8..67defb0a5a 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -254,7 +254,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 				mstp_tvb_pdu_len-2, mstp_frame_pdu_len);
 		}
 
-		if (!(dissector_try_port(subdissector_table, (vendorid<<16) + mstp_frame_type, 
+		if (!(dissector_try_uint(subdissector_table, (vendorid<<16) + mstp_frame_type, 
 			next_tvb, pinfo, tree))) {
 				/* Unknown function - dissect the payload as data */
 				call_dissector(data_handle, next_tvb, pinfo, tree);
@@ -435,11 +435,11 @@ proto_reg_handoff_mstp(void)
 	dissector_handle_t bacnet_handle;
 
 	mstp_handle = find_dissector("mstp");
-	dissector_add("wtap_encap", WTAP_ENCAP_BACNET_MS_TP, mstp_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_BACNET_MS_TP, mstp_handle);
 
 	bacnet_handle = find_dissector("bacnet");
 	data_handle = find_dissector("data");
 
-	dissector_add("mstp.vendor_frame_type", (0/*VendorID ASHRAE*/ << 16) + MSTP_BACNET_DATA_EXPECTING_REPLY, bacnet_handle);
-	dissector_add("mstp.vendor_frame_type", (0/*VendorID ASHRAE*/ << 16) + MSTP_BACNET_DATA_NOT_EXPECTING_REPLY, bacnet_handle);
+	dissector_add_uint("mstp.vendor_frame_type", (0/*VendorID ASHRAE*/ << 16) + MSTP_BACNET_DATA_EXPECTING_REPLY, bacnet_handle);
+	dissector_add_uint("mstp.vendor_frame_type", (0/*VendorID ASHRAE*/ << 16) + MSTP_BACNET_DATA_NOT_EXPECTING_REPLY, bacnet_handle);
 }
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 462f074734..24c0519810 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -415,8 +415,8 @@ proto_reg_handoff_mtp2(void)
   dissector_handle_t mtp2_handle;
 
   mtp2_handle = find_dissector("mtp2");
-  dissector_add("wtap_encap", WTAP_ENCAP_MTP2, mtp2_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_MTP2_WITH_PHDR, mtp2_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP2, mtp2_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP2_WITH_PHDR, mtp2_handle);
 
   mtp3_handle   = find_dissector("mtp3");
 }
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index 31beccea5e..431a8a3ec2 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -641,7 +641,7 @@ dissect_mtp3_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_INFO, "DATA ");
 
-  if (!dissector_try_port(mtp3_sio_dissector_table, service_indicator, payload_tvb, pinfo, tree))
+  if (!dissector_try_uint(mtp3_sio_dissector_table, service_indicator, payload_tvb, pinfo, tree))
     call_dissector(data_handle, payload_tvb, pinfo, tree);
 }
 
@@ -847,7 +847,7 @@ proto_reg_handoff_mtp3(void)
   dissector_handle_t mtp3_handle;        
          
   mtp3_handle = find_dissector("mtp3");               
-  dissector_add("wtap_encap", WTAP_ENCAP_MTP3, mtp3_handle);     
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP3, mtp3_handle);     
   dissector_add_string("tali.opcode", "mtp3", mtp3_handle);
                  
   data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 099b2f20dd..235e01f5fb 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1537,12 +1537,12 @@ proto_reg_handoff_mtp3mg(void)
 
     mtp3mg_handle = find_dissector("mtp3mg");
 
-    dissector_add("mtp3.service_indicator", MTP3MG_SI, mtp3mg_handle);
+    dissector_add_uint("mtp3.service_indicator", MTP3MG_SI, mtp3mg_handle);
 
     /*  SI 1 is unused in ANSI and SI 2 is unused in ITU, so it's okay for us
      *  to grab both (regardless of mtp3.standard setting) here.
      */
-    dissector_add("mtp3.service_indicator", MTP3MG_ITU_TEST_SI, mtp3mg_handle);
-    dissector_add("mtp3.service_indicator", MTP3MG_ANSI_TEST_SI, mtp3mg_handle);
+    dissector_add_uint("mtp3.service_indicator", MTP3MG_ITU_TEST_SI, mtp3mg_handle);
+    dissector_add_uint("mtp3.service_indicator", MTP3MG_ANSI_TEST_SI, mtp3mg_handle);
 }
 
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 660a13afc9..524e0bfce1 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -568,7 +568,7 @@ void proto_reg_handoff_mysql(void)
 {
 	dissector_handle_t mysql_handle;
 	mysql_handle = create_dissector_handle(dissect_mysql, proto_mysql);
-	dissector_add("tcp.port", TCP_PORT_MySQL, mysql_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_MySQL, mysql_handle);
 }
 
 /* protocol registration */
@@ -1207,7 +1207,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MySQL");
 
-	if (pinfo->destport == pinfo->match_port) {
+	if (pinfo->destport == pinfo->match_uint) {
 		is_response= FALSE;
 	} else {
 		is_response= TRUE;
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index 23d61fcc89..420ada0ba9 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -204,11 +204,11 @@ dissect_nasdaq_soup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 /* Register the protocol with Wireshark */
 static void range_delete_nasdaq_soup_tcp_callback(guint32 port) {
-    dissector_delete("tcp.port", port, nasdaq_soup_handle);
+    dissector_delete_uint("tcp.port", port, nasdaq_soup_handle);
 }
 
 static void range_add_nasdaq_soup_tcp_callback(guint32 port) {
-    dissector_add("tcp.port", port, nasdaq_soup_handle);
+    dissector_add_uint("tcp.port", port, nasdaq_soup_handle);
 }
 
 static void nasdaq_soup_prefs(void) 
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index b11ce72e5f..0f7e5a295b 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -218,8 +218,8 @@ void proto_reg_handoff_nat_pmp (void)
   dissector_handle_t nat_pmp_handle;
 
   nat_pmp_handle = find_dissector (PFNAME);
-  dissector_add ("udp.port", NAT_PMP_STATUS_PORT, nat_pmp_handle);
-  dissector_add ("udp.port", NAT_PMP_PORT, nat_pmp_handle);
+  dissector_add_uint ("udp.port", NAT_PMP_STATUS_PORT, nat_pmp_handle);
+  dissector_add_uint ("udp.port", NAT_PMP_PORT, nat_pmp_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index aa0d93d360..970f31c494 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -52859,12 +52859,12 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -67717,978 +67717,978 @@ proto_reg_handoff_nbap(void)
 	dissector_handle_t nbap_handle;
 
 	nbap_handle = find_dissector("nbap");
-	dissector_add("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
+	dissector_add_uint("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
 	dissector_add_handle("sctp.port", nbap_handle);  /* for "decode-as" */
 
 
 /*--- Included file: packet-nbap-dis-tab.c ---*/
 #line 1 "packet-nbap-dis-tab.c"
-  dissector_add("nbap.ies", id_TUTRANGPSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementValueInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SFNSFNMeasurementValueInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementValueInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHRequiredPowerValueInformation, new_create_dissector_handle(dissect_HS_DSCHRequiredPower_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRate_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion_Value, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_For_CellPortion_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_total_wide_band_power_For_CellPortion_Value, new_create_dissector_handle(dissect_Received_total_wide_band_power_For_CellPortion_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UpPTSInterferenceValue, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DLTransmissionBranchLoadValue, new_create_dissector_handle(dissect_DLTransmissionBranchLoadValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHRequiredPowerValueInformation_For_CellPortion, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValueInformation_For_CellPortion_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation_For_CellPortion, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRateValueInformation_For_CellPortion_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_DCHProvidedBitRateValueInformation, new_create_dissector_handle(dissect_E_DCHProvidedBitRate_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_DCH_Non_serving_Relative_Grant_Down_CommandsValue, new_create_dissector_handle(dissect_E_DCH_Non_serving_Relative_Grant_Down_Commands_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_Value, new_create_dissector_handle(dissect_Received_Scheduled_EDCH_Power_Share_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value, new_create_dissector_handle(dissect_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TUTRANGANSSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementValueInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Rx_Timing_Deviation_Value_LCR, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_LCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Angle_Of_Arrival_Value_LCR, new_create_dissector_handle(dissect_Angle_Of_Arrival_Value_LCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_SICH_Reception_Quality, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Best_Cell_Portions_Value, new_create_dissector_handle(dissect_Best_Cell_Portions_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Rx_Timing_Deviation_Value_768, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Rx_Timing_Deviation_Value_384_ext, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_384_ext_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Extended_Round_Trip_Time_Value, new_create_dissector_handle(dissect_Extended_Round_Trip_Time_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_neighbouringTDDCellMeasurementInformationLCR, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_neighbouringTDDCellMeasurementInformation768, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformation768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ReportCharacteristicsType_OnModification, new_create_dissector_handle(dissect_ReportCharacteristicsType_OnModification_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_total_wide_band_power_For_CellPortion, new_create_dissector_handle(dissect_Received_total_wide_band_power_Value_IncrDecrThres_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortion, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_Scheduled_EDCH_Power_Share, new_create_dissector_handle(dissect_RSEPS_Value_IncrDecrThres_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TUTRANGPSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementThresholdInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SFNSFNMeasurementThresholdInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementThresholdInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHRequiredPowerValue, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHRequiredPowerValue_For_Cell_Portion, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_For_CellPortion, new_create_dissector_handle(dissect_RSEPS_Value_IncrDecrThres_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Additional_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TUTRANGANSSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementThresholdInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ConfigurationGenerationID, new_create_dissector_handle(dissect_ConfigurationGenerationID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonPhysicalChannelType_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_ParametersListIE_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_ParametersItem_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RACH_ParametersItem_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_RACH_ParametersItem_CTCH_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonPhysicalChannelType_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_ParametersListIE_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PICH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PICH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_LCR_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RACH_ParameterItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_RACH_ParameterItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_ParametersList_CTCH_SetupRsp, new_create_dissector_handle(dissect_FACH_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_Parameters_CTCH_SetupRsp, new_create_dissector_handle(dissect_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RACH_Parameters_CTCH_SetupRsp, new_create_dissector_handle(dissect_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonPhysicalChannelType_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_ParametersItem_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PICH_ParametersItem_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PICH_ParametersItem_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PRACH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_AICH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_AICH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PICH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PICH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_ParametersList_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_FACH_ParametersList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonPhysicalChannelID, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_BlockingPriorityIndicator, new_create_dissector_handle(dissect_BlockingPriorityIndicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ShutdownTimer, new_create_dissector_handle(dissect_ShutdownTimer_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Start_Of_Audit_Sequence_Indicator, new_create_dissector_handle(dissect_Start_Of_Audit_Sequence_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_End_Of_Audit_Sequence_Indicator, new_create_dissector_handle(dissect_End_Of_Audit_Sequence_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_InformationList_AuditRsp, new_create_dissector_handle(dissect_Cell_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CCP_InformationList_AuditRsp, new_create_dissector_handle(dissect_CCP_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_InformationList_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_Group_InformationList_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_Group_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Cell_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_P_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_S_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_P_CPICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_S_CPICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_P_CCPCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_BCH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_S_CCPCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FACH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RACH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_AICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CCP_InformationItem_AuditRsp, new_create_dissector_handle(dissect_CCP_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FPACH_LCR_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_S_CCPCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACH_768_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_Group_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PLCCH_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_RUCCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_RUCCH_768_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MeasurementID, new_create_dissector_handle(dissect_MeasurementID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonMeasurementObjectType_CM_Rqst, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonMeasurementType, new_create_dissector_handle(dissect_CommonMeasurementType_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MeasurementFilterCoefficient, new_create_dissector_handle(dissect_MeasurementFilterCoefficient_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SFN, new_create_dissector_handle(dissect_SFN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rqst, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonMeasurementObjectType_CM_Rsp, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rsp, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommonMeasurementObjectType_CM_Rprt, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rprt, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_ID, new_create_dissector_handle(dissect_Local_Cell_ID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_T_Cell, new_create_dissector_handle(dissect_T_Cell_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UARFCNforNu, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UARFCNforNd, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MaximumTransmissionPower, new_create_dissector_handle(dissect_MaximumTransmissionPower_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Closed_Loop_Timing_Adjustment_Mode, new_create_dissector_handle(dissect_Closedlooptimingadjustmentmode_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimaryScramblingCode, new_create_dissector_handle(dissect_PrimaryScramblingCode_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Synchronisation_Configuration_Cell_SetupRqst, new_create_dissector_handle(dissect_Synchronisation_Configuration_Cell_SetupRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_TPC_Pattern01Count, new_create_dissector_handle(dissect_DL_TPC_Pattern01Count_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimarySCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimarySCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondarySCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondarySCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimaryCPICH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimaryCPICH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondaryCPICH_InformationList_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationList_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimaryCCPCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimaryCCPCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Limited_power_increase_information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_Limited_power_increase_information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondaryCPICH_InformationItem_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationItem_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellPortion_InformationItem_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationItem_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UARFCNforNt, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellParameterID, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmissionDiversityApplied, new_create_dissector_handle(dissect_TransmissionDiversityApplied_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SyncCase, new_create_dissector_handle(dissect_SyncCase_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DPCHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PRACHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TimingAdvanceApplied, new_create_dissector_handle(dissect_TimingAdvanceApplied_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SCH_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_SCH_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCCPCH_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TimeSlotConfigurationList_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH, new_create_dissector_handle(dissect_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Synchronisation_Configuration_Cell_ReconfRqst, new_create_dissector_handle(dissect_Synchronisation_Configuration_Cell_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimarySCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimarySCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondarySCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondarySCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimaryCPICH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimaryCPICH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PrimaryCCPCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimaryCCPCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellPortion_InformationItem_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationItem_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SCH_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_SCH_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PCCPCH_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_PCCPCH_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TimeSlotConfigurationList_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_IndicationType_ResourceStatusInd, new_create_dissector_handle(dissect_IndicationType_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_Group_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Local_Cell_Group_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Power_Local_Cell_Group_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CCP_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_CCP_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FPACH_LCR_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DwPCH_LCR_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PLCCH_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_S_CCPCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_BCCH_ModificationTime, new_create_dissector_handle(dissect_BCCH_ModificationTime_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst, new_create_dissector_handle(dissect_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SegmentInformationListIE_SystemInfoUpdate, new_create_dissector_handle(dissect_SegmentInformationListIE_SystemInfoUpdate_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CRNC_CommunicationContextID, new_create_dissector_handle(dissect_CRNC_CommunicationContextID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_FDD_Information, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationList_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Transmission_Gap_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Transmission_Gap_Pattern_Sequence_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Active_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Active_Pattern_Sequence_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_TDD_Information, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCH_TDD_Information, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_Information, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_NodeB_CommunicationContextID, new_create_dissector_handle(dissect_NodeB_CommunicationContextID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommunicationControlPortID, new_create_dissector_handle(dissect_CommunicationControlPortID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseList_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_SetupRspFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseItem_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_SetupRspFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCH_InformationResponse, new_create_dissector_handle(dissect_DSCH_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_InformationResponse, new_create_dissector_handle(dissect_USCH_InformationResponse_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_RL_SetupFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Successful_RL_InformationRespItem_RL_SetupFailureFDD, new_create_dissector_handle(dissect_Successful_RL_InformationRespItem_RL_SetupFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_RL_SetupFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_RL_InformationResp_RL_SetupFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationResp_RL_SetupFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Compressed_Mode_Deactivation_Flag, new_create_dissector_handle(dissect_Compressed_Mode_Deactivation_Flag_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationList_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_AdditionRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_AdditionRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseList_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_AdditionRspFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseItem_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_AdditionRspFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Successful_RL_InformationRespItem_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_Successful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_FDD_DCHs_to_Modify, new_create_dissector_handle(dissect_FDD_DCHs_to_Modify_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCHs_to_Add_FDD, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_DeleteList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TDD_DCHs_to_Modify, new_create_dissector_handle(dissect_TDD_DCHs_to_Modify_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCHs_to_Add_TDD, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCH_Information_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_Information_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCHs_to_Add_TDD, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCH_Information_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_Information_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_Information_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_Information_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_Information_Add, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_Information_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_Information_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationModify_AddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationModify_ModifyListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationModify_AddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationModify_ModifyListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseList_RL_ReconfReady, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfReady_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseItem_RL_ReconfReady, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfReady_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_RL_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_RL_ReconfFailure_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_ReconfigurationFailureItem_RL_ReconfFailure, new_create_dissector_handle(dissect_RL_ReconfigurationFailureItem_RL_ReconfFailure_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_DeleteList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_DeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Information_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseList_RL_ReconfRsp, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationResponseItem_RL_ReconfRsp, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_informationList_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_informationList_RL_DeletionRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_informationItem_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_informationItem_RL_DeletionRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PowerAdjustmentType, new_create_dissector_handle(dissect_PowerAdjustmentType_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InnerLoopDLPCStatus, new_create_dissector_handle(dissect_InnerLoopDLPCStatus_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DLReferencePowerList_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MaxAdjustmentStep, new_create_dissector_handle(dissect_MaxAdjustmentStep_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_AdjustmentPeriod, new_create_dissector_handle(dissect_AdjustmentPeriod_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_AdjustmentRatio, new_create_dissector_handle(dissect_ScaledAdjustmentRatio_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DL_ReferencePowerInformationItem_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationItem_DL_PC_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TimeslotISCPInfo, new_create_dissector_handle(dissect_DL_TimeslotISCPInfo_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rqst, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DedicatedMeasurementType, new_create_dissector_handle(dissect_DedicatedMeasurementType_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rsp, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Set_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rprt, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Set_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Reporting_Object_RL_FailureInd, new_create_dissector_handle(dissect_Reporting_Object_RL_FailureInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_FailureInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Set_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_RL_Set_InformationItem_RL_FailureInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CCTrCH_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_FailureInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationList_RL_PreemptRequiredInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_PreemptRequiredInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Reporting_Object_RL_RestoreInd, new_create_dissector_handle(dissect_Reporting_Object_RL_RestoreInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_RestoreInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_RL_Set_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Set_InformationItem_RL_RestoreInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CCTrCH_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_RestoreInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_PDSCH_HS_SCCH_E_AGCH_E_RGCH_E_HICH_MaxPower_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MaximumTransmissionPower_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_PDSCH_HS_SCCH_ScramblingCode_PSCH_ReconfRqst, new_create_dissector_handle(dissect_DL_ScramblingCode_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_PDSCH_FDD_Code_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_PDSCH_FDD_Code_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_SCCH_FDD_Code_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_FDD_Code_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCHSets_AddList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_AddList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCHSets_ModifyList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_ModifyList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCHSets_DeleteList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_DeleteList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCHSets_AddList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_AddList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCHSets_ModifyList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_ModifyList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCHSets_DeleteList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_DeleteList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCH_Information_AddListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_Information_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCH_Information_ModifyListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PDSCH_ModifyInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCH_Information_AddListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_Information_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCH_Information_ModifyListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PUSCH_ModifyInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_PSCH_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_PSCH_ReconfFailure_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ResetIndicator, new_create_dissector_handle(dissect_ResetIndicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommunicationContextInfoItem_Reset, new_create_dissector_handle(dissect_CommunicationContextInfoItem_Reset_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CommunicationControlPortInfoItem_Reset, new_create_dissector_handle(dissect_CommunicationControlPortInfoItem_Reset_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_cellSyncBurstRepetitionPeriod, new_create_dissector_handle(dissect_CellSyncBurstRepetitionPeriod_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_timeslotInfo_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_TimeslotInfo_CellSyncInitiationRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncBurstTransInit_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstTransInit_CellSyncInitiationRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TimeSlot, new_create_dissector_handle(dissect_TimeSlot_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_NCyclesPerSFNperiod, new_create_dissector_handle(dissect_NCyclesPerSFNperiod_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_NRepetitionsPerCyclePeriod, new_create_dissector_handle(dissect_NRepetitionsPerCyclePeriod_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncBurstMeasReconfiguration_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasInfo_CellSyncReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncBurstMeasInfoList_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SynchronisationReportType, new_create_dissector_handle(dissect_SynchronisationReportType_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SynchronisationReportCharacteristics, new_create_dissector_handle(dissect_SynchronisationReportCharacteristics_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellAdjustmentInfo_SyncAdjustmntRqstTDD, new_create_dissector_handle(dissect_CellAdjustmentInfo_SyncAdjustmentRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellAdjustmentInfoItem_SyncAdjustmentRqstTDD, new_create_dissector_handle(dissect_CellAdjustmentInfoItem_SyncAdjustmentRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CauseLevel_SyncAdjustmntFailureTDD, new_create_dissector_handle(dissect_CauseLevel_SyncAdjustmntFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CSBTransmissionID, new_create_dissector_handle(dissect_CSBTransmissionID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CSBMeasurementID, new_create_dissector_handle(dissect_CSBMeasurementID_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_CellSyncInfo_CellSyncReprtTDD, new_create_dissector_handle(dissect_CellSyncInfo_CellSyncReprtTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SyncReportType_CellSyncReprtTDD, new_create_dissector_handle(dissect_SyncReportType_CellSyncReprtTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_SignallingBearerRequestIndicator, new_create_dissector_handle(dissect_SignallingBearerRequestIndicator_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_DCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DSCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_DSCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_USCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_USCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HSDSCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_HSDSCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DelayedActivationList_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DelayedActivationInformation_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdFDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DelayedActivationList_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_DelayedActivationInformation_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HSDSCH_FDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Update_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HSDSCH_TDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Update_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Modification_Period, new_create_dissector_handle(dissect_Modification_Period_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MICH_CFN, new_create_dissector_handle(dissect_MICH_CFN_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_NI_Information_NotifUpdateCmd, new_create_dissector_handle(dissect_NI_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp, new_create_dissector_handle(dissect_Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UPPCH_LCR_InformationItem_AuditRsp, new_create_dissector_handle(dissect_UPPCH_LCR_InformationItem_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UPPCH_LCR_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_UPPCH_LCR_InformationItem_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UARFCNSpecificCauseList, new_create_dissector_handle(dissect_UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_MultipleFreq_E_HICH_TimeOffsetLCR, new_create_dissector_handle(dissect_MultipleFreq_E_HICH_TimeOffsetLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_PLCCH_parameters, new_create_dissector_handle(dissect_PLCCH_parameters_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_RUCCH_parameters, new_create_dissector_handle(dissect_E_RUCCH_parameters_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_RUCCH_768_parameters, new_create_dissector_handle(dissect_E_RUCCH_768_parameters_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Cell_ERNTI_Status_Information, new_create_dissector_handle(dissect_Cell_ERNTI_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ERACH_CM_Rqst, new_create_dissector_handle(dissect_ERACH_CM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ERACH_CM_Rsp, new_create_dissector_handle(dissect_ERACH_CM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ERACH_CM_Rprt, new_create_dissector_handle(dissect_ERACH_CM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_EDCH_RACH_Report_Value, new_create_dissector_handle(dissect_EDCH_RACH_Report_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_EDCH_RACH_Report_IncrDecrThres, new_create_dissector_handle(dissect_EDCH_RACH_Report_IncrDecrThres_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_EDCH_RACH_Report_ThresholdInformation, new_create_dissector_handle(dissect_EDCH_RACH_Report_ThresholdInformation_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_NAVKeplerianSet_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ReducedKeplerianSet_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_MidiAlmanacSet_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_ALM_GlonassAlmanacSet_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ECEFsbasAlmanacSet_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ULTimeslotISCPValue_For_CellPortion, new_create_dissector_handle(dissect_UL_TimeslotISCP_Value_IncrDecrThres_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UpPTSInterferenceValue_For_CellPortion, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Best_Cell_Portions_ValueLCR, new_create_dissector_handle(dissect_Best_Cell_Portions_ValueLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion_ValueLCR, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_For_CellPortion_ValueLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Received_total_wide_band_power_For_CellPortion_ValueLCR, new_create_dissector_handle(dissect_Received_total_wide_band_power_For_CellPortion_ValueLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UL_TimeslotISCP_For_CellPortion_Value, new_create_dissector_handle(dissect_UL_TimeslotISCP_For_CellPortion_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_E_DCHProvidedBitRateValueInformation_For_CellPortion, new_create_dissector_handle(dissect_E_DCHProvidedBitRateValueInformation_For_CellPortion_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_UpPTSInterference_For_CellPortion_Value, new_create_dissector_handle(dissect_UpPTSInterference_For_CellPortion_Value_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortion, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_ActivationInformation, new_create_dissector_handle(dissect_ActivationInformation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_BroadcastCommonTransportBearerIndication, new_create_dissector_handle(dissect_BroadcastCommonTransportBearerIndication_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TnlQos, new_create_dissector_handle(dissect_TnlQos_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Unidirectional_DCH_Indicator, new_create_dissector_handle(dissect_Unidirectional_DCH_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ExtendedPropagationDelay, new_create_dissector_handle(dissect_ExtendedPropagationDelay_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Initial_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_bindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_transportlayeraddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_PowerOffset_for_SchedulingInfo, new_create_dissector_handle(dissect_E_DCH_PowerOffset_for_SchedulingInfo_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SAT_Info_Almanac_ExtItem, new_create_dissector_handle(dissect_SAT_Info_Almanac_ExtList_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HARQ_Preamble_Mode, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_HSDSCH_MACdPDUSizeFormat_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ueCapability_Info, new_create_dissector_handle(dissect_UE_Capability_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_PDSCH_Code_Change_Grant, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Grant_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HARQ_Preamble_Mode_Activation_Indicator, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_Activation_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_hsSCCH_Specific_Information_ResponseTDD768, new_create_dissector_handle(dissect_HSSCCH_Specific_InformationRespListTDD768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MaximumMACdPDU_SizeExtended, new_create_dissector_handle(dissect_MAC_PDU_SizeExtended_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_failed_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_failed_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_missed_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_missed_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_total_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_total_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Information, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Information_Response, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Information_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_PDSCH_Code_Change_Indicator, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Information, new_create_dissector_handle(dissect_GANSS_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Common_Data, new_create_dissector_handle(dissect_GANSS_Common_Data_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Generic_Data, new_create_dissector_handle(dissect_GANSS_Generic_Data_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SyncDLCodeIdThreInfoLCR, new_create_dissector_handle(dissect_SyncDLCodeIdThreInfoLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_LCRTDD_uplink_Physical_Channel_Capability, new_create_dissector_handle(dissect_LCRTDD_Uplink_Physical_Channel_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PLCCH_Information_UL_TimeslotLCR_Info, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Parameters_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_FDD_S_CCPCH_FrameOffset_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_FDD_S_CCPCH_FrameOffset_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ModulationPO_MBSFN, new_create_dissector_handle(dissect_ModulationPO_MBSFN_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Secondary_CCPCH_SlotFormat_Extended, new_create_dissector_handle(dissect_Secondary_CCPCH_SlotFormat_Extended_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_BroadcastReference, new_create_dissector_handle(dissect_BroadcastReference_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Tstd_indicator, new_create_dissector_handle(dissect_TSTD_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_S_CCPCH_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterExtendedList_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_S_CCPCH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_768_parameterList_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_Modulation, new_create_dissector_handle(dissect_ModulationMBSFN_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_tFCI_Presence, new_create_dissector_handle(dissect_TFCI_Presence_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_maxFACH_Power_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PCH_Power_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PICH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_768_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_FPACH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_FPACH_LCR_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PRACH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_768_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Parameters_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_FPACH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_FPACH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PLCCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PLCCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PICH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PICH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_MICH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_S_CCPCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_S_CCPCH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_maxFACH_Power_LCR_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PCH_Power_LCR_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CommonPhysicalChannelID768_CommonTrChDeletionReq, new_create_dissector_handle(dissect_CommonPhysicalChannelID768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Power_Local_Cell_Group_InformationList_AuditRsp, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_FPACH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_FPACH_LCR_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DwPCH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Resources_Information_AuditRsp, new_create_dissector_handle(dissect_HS_DSCH_Resources_Information_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_InformationListExt_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_InformationListExt_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_LCR_InformationListExt_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_LCR_InformationListExt_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Resources_Information_AuditRsp, new_create_dissector_handle(dissect_E_DCH_Resources_Information_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PLCCH_InformationList_AuditRsp, new_create_dissector_handle(dissect_PLCCH_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_P_CCPCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_768_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PICH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PRACH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_PRACH_768_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RUCCH_InformationList_AuditRsp, new_create_dissector_handle(dissect_E_RUCCH_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RUCCH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_E_RUCCH_768_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ReferenceClockAvailability, new_create_dissector_handle(dissect_ReferenceClockAvailability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Power_Local_Cell_Group_ID, new_create_dissector_handle(dissect_Local_Cell_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDPA_Capability, new_create_dissector_handle(dissect_HSDPA_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Capability, new_create_dissector_handle(dissect_E_DCH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_TTI2ms_Capability, new_create_dissector_handle(dissect_E_DCH_TTI2ms_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_SF_Capability, new_create_dissector_handle(dissect_E_DCH_SF_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_HARQ_Combining_Capability, new_create_dissector_handle(dissect_E_DCH_HARQ_Combining_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_CapacityConsumptionLaw, new_create_dissector_handle(dissect_E_DCHCapacityConsumptionLaw_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_F_DPCH_Capability, new_create_dissector_handle(dissect_F_DPCH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_TDD_CapacityConsumptionLaw, new_create_dissector_handle(dissect_E_DCH_TDD_CapacityConsumptionLaw_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityDTX_DRX_Capability, new_create_dissector_handle(dissect_ContinuousPacketConnectivityDTX_DRX_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Max_UE_DTX_Cycle, new_create_dissector_handle(dissect_Max_UE_DTX_Cycle_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Capability, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_Capability, new_create_dissector_handle(dissect_MIMO_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixtyfourQAM_DL_Capability, new_create_dissector_handle(dissect_SixtyfourQAM_DL_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBMS_Capability, new_create_dissector_handle(dissect_MBMS_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_FACH_Capability, new_create_dissector_handle(dissect_Enhanced_FACH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_PCH_Capability, new_create_dissector_handle(dissect_Enhanced_PCH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixteenQAM_UL_Capability, new_create_dissector_handle(dissect_SixteenQAM_UL_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_MACdPDU_SizeCapability, new_create_dissector_handle(dissect_HSDSCH_MACdPDU_SizeCapability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_F_DPCH_SlotFormatCapability, new_create_dissector_handle(dissect_F_DPCH_SlotFormatCapability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CommonMeasurementAccuracy, new_create_dissector_handle(dissect_CommonMeasurementAccuracy_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MeasurementRecoveryBehavior, new_create_dissector_handle(dissect_MeasurementRecoveryBehavior_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RTWP_ReportingIndicator, new_create_dissector_handle(dissect_RTWP_ReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RTWP_CellPortion_ReportingIndicator, new_create_dissector_handle(dissect_RTWP_CellPortion_ReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Reference_ReceivedTotalWideBandPowerReporting, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPowerReporting_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeSlotLCR_CM_Rqst, new_create_dissector_handle(dissect_TimeSlotLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NeighbouringCellMeasurementInformation, new_create_dissector_handle(dissect_NeighbouringCellMeasurementInformation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MeasurementRecoverySupportIndicator, new_create_dissector_handle(dissect_MeasurementRecoverySupportIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Reference_ReceivedTotalWideBandPowerSupportIndicator, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPowerSupportIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Reference_ReceivedTotalWideBandPower, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPower_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MeasurementRecoveryReportingIndicator, new_create_dissector_handle(dissect_MeasurementRecoveryReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CellPortion_InformationList_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationList_Cell_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_PilotConfiguration, new_create_dissector_handle(dissect_MIMO_PilotConfiguration_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PCCPCH_LCR_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_LCR_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DwPCH_LCR_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_DwPCH_LCR_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ReferenceSFNoffset, new_create_dissector_handle(dissect_ReferenceSFNoffset_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_LCR_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_LCR_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PCCPCH_768_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_768_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SCH_768_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_SCH_768_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBSFN_Only_Mode_Indicator_Cell_SetupRqstTDD_LCR, new_create_dissector_handle(dissect_MBSFN_Only_Mode_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBSFN_Cell_ParameterID_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Time_Slot_Parameter_ID, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CellPortion_InformationList_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationList_Cell_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DwPCH_LCR_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_DwPCH_LCR_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPDLParameter_Information_LCR_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_LCR_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SCH_768_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_SCH_768_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PCCPCH_768_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_PCCPCH_768_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBSFN_Cell_ParameterID_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Power_Local_Cell_Group_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBSFN_Only_Mode_Capability, new_create_dissector_handle(dissect_MBSFN_Only_Mode_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Power_Local_Cell_Group_InformationList2_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList2_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_FPACH_LCR_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_FPACH_LCR_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DwPCH_LCR_Information_ResourceStatusInd, new_create_dissector_handle(dissect_DwPCH_LCR_Information_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Resources_Information_ResourceStatusInd, new_create_dissector_handle(dissect_HS_DSCH_Resources_Information_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_InformationListExt_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_InformationListExt_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_LCR_InformationListExt_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_LCR_InformationListExt_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Resources_Information_ResourceStatusInd, new_create_dissector_handle(dissect_E_DCH_Resources_Information_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PLCCH_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_PLCCH_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_P_CCPCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_S_CCPCH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PICH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PRACH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_PRACH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MICH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RUCCH_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_E_RUCCH_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RUCCH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_E_RUCCH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_PowerBalancing_Information, new_create_dissector_handle(dissect_DL_PowerBalancing_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_FDD_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_RNTI, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSPDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_FDD_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Serving_E_DCH_RL_ID, new_create_dissector_handle(dissect_Serving_E_DCH_RL_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_F_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Initial_DL_DPCH_TimingAdjustment_Allowed, new_create_dissector_handle(dissect_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DCH_Indicator_For_E_DCH_HSDPA_Operation, new_create_dissector_handle(dissect_DCH_Indicator_For_E_DCH_HSDPA_Operation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Serving_Cell_Change_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityDTX_DRX_Information, new_create_dissector_handle(dissect_ContinuousPacketConnectivityDTX_DRX_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DPC_Mode, new_create_dissector_handle(dissect_DPC_Mode_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPDCH_Indicator_For_E_DCH_Operation, new_create_dissector_handle(dissect_UL_DPDCH_Indicator_For_E_DCH_Operation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RL_Specific_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_DCH_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DelayedActivation, new_create_dissector_handle(dissect_DelayedActivation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Primary_CPICH_Usage_for_Channel_Estimation, new_create_dissector_handle(dissect_Primary_CPICH_Usage_for_Channel_Estimation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Secondary_CPICH_Information, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_RL_Indication, new_create_dissector_handle(dissect_E_DCH_RL_Indication_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RL_Specific_E_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_E_DCH_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SynchronisationIndicator, new_create_dissector_handle(dissect_SynchronisationIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_F_DPCH_SlotFormat, new_create_dissector_handle(dissect_F_DPCH_SlotFormat_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_TDD_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Information, new_create_dissector_handle(dissect_E_DCH_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Serving_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_768_Information, new_create_dissector_handle(dissect_E_DCH_768_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_LCR_Information, new_create_dissector_handle(dissect_E_DCH_LCR_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_768_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_768_Information_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Maximum_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Minimum_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_768_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_768_Information_RL_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeslotISCP_LCR_InfoList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_Synchronisation_Parameters_LCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_FDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_PowerBalancing_ActivationIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_ActivationIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_RL_Set_ID, new_create_dissector_handle(dissect_RL_Set_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_FDD_DL_Control_Channel_Information, new_create_dissector_handle(dissect_E_DCH_FDD_DL_Control_Channel_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Initial_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_FDD_Information_Response, new_create_dissector_handle(dissect_E_DCH_FDD_Information_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RL_InformationResponse_LCR_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_LCR_RL_SetupRspTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_TDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Information_Response, new_create_dissector_handle(dissect_E_DCH_Information_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_Serving_Cell_Change_Info, new_create_dissector_handle(dissect_HS_DSCH_Serving_Cell_Change_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPCH_Information_RL_AdditionReqFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_AdditionReqFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Configured_Indicator, new_create_dissector_handle(dissect_HSDSCH_Configured_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_InformationItem_768_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_DownlinkStepSize_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Maximum_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Minimum_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_InformationItem_768_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeslotISCP_InformationList_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_Serving_Cell_Change_Info_Response, new_create_dissector_handle(dissect_HS_DSCH_Serving_Cell_Change_Info_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Serving_Cell_Change_Info_Response, new_create_dissector_handle(dissect_E_DCH_Serving_Cell_Change_Info_Response_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MAChs_ResetIndicator, new_create_dissector_handle(dissect_MAChs_ResetIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RL_InformationResponse_LCR_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_LCR_RL_AdditionRspTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SignallingBearerRequestIndicator, new_create_dissector_handle(dissect_SignallingBearerRequestIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Information_to_Modify, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_to_Delete_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_FDD_Information_to_Modify, new_create_dissector_handle(dissect_E_DCH_FDD_Information_to_Modify_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_E_DCH_MACdFlows_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_Delete_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_F_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Fast_Reconfiguration_Mode, new_create_dissector_handle(dissect_Fast_Reconfiguration_Mode_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CPC_Information, new_create_dissector_handle(dissect_CPC_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_Power_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Secondary_CPICH_Information_Change, new_create_dissector_handle(dissect_Secondary_CPICH_Information_Change_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_MultipleRL_Information_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_Information_Reconfig_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_768_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_768_Information_Reconfig_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_LCR_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Reconfig_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_UplinkStepSize_InformationAdd_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleRL_ul_DPCH_InformationList, new_create_dissector_handle(dissect_MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_768_InformationAddItemIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_768_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_LCR_InformationModify_AddList, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_UplinkStepSize_InformationModify_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleRL_ul_DPCH_InformationModifyList, new_create_dissector_handle(dissect_MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_768_InformationModify_AddItem, new_create_dissector_handle(dissect_UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_768_InformationModify_AddList, new_create_dissector_handle(dissect_UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_TimeslotLCR_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_Timeslot768_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_Timeslot768_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PLCCH_Information_RL_ReconfPrepTDDLCR, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_DPCH_TimeSlotFormat_LCR_ModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_DownlinkStepSize_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleRL_dl_DPCH_InformationList, new_create_dissector_handle(dissect_MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_768_InformationAddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TDD_TPC_DownlinkStepSize_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleRL_dl_DPCH_InformationModifyList, new_create_dissector_handle(dissect_MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_768_InformationModify_AddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Minimum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_TimeSlotFormat_LCR_ModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_InitDL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeslotISCP_LCR_InfoList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TargetCommunicationControlPortID, new_create_dissector_handle(dissect_CommunicationControlPortID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Fast_Reconfiguration_Permission, new_create_dissector_handle(dissect_Fast_Reconfiguration_Permission_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_PowerBalancing_UpdatedIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_UpdatedIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Information_to_Modify_Unsynchronised, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_Unsynchronised_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_RL_Information_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_Multiple_RL_Information_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleRL_dl_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeslotISCPInfoList_LCR_DL_PC_RqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PrimCCPCH_RSCP_DL_PC_RqstTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PrimaryCCPCH_RSCP_Delta, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_Delta_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NumberOfReportedCellPortions, new_create_dissector_handle(dissect_NumberOfReportedCellPortions_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_AlternativeFormatReportingIndicator, new_create_dissector_handle(dissect_AlternativeFormatReportingIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_Info_DM_Rqst, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_Info_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DPCH_ID768_DM_Rqst, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_Info_DM_Rsp, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_Info_DM_Rsp, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_DedicatedMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_PUSCH_InfoList_DM_Rsp, new_create_dissector_handle(dissect_Multiple_PUSCH_InfoList_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_HSSICHMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DPCH_ID768_DM_Rsp, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_Info_DM_Rprt, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_Info_DM_Rprt, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multiple_PUSCH_InfoList_DM_Rprt, new_create_dissector_handle(dissect_Multiple_PUSCH_InfoList_DM_Rprt_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DPCH_ID768_DM_Rprt, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code, new_create_dissector_handle(dissect_DL_ScramblingCode_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_AGCH_FDD_Code_Information, new_create_dissector_handle(dissect_E_AGCH_FDD_Code_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RGCH_E_HICH_FDD_Code_Information, new_create_dissector_handle(dissect_E_RGCH_E_HICH_FDD_Code_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDPA_And_EDCH_CellPortion_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_Target_ReceivedTotalWideBandPower, new_create_dissector_handle(dissect_Maximum_Target_ReceivedTotalWideBandPower_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Target_NonServing_EDCH_To_Total_EDCH_Power_Ratio, new_create_dissector_handle(dissect_Target_NonServing_EDCH_To_Total_EDCH_Power_Ratio_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Common_System_InformationFDD, new_create_dissector_handle(dissect_HSDSCH_Common_System_InformationFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Paging_System_InformationFDD, new_create_dissector_handle(dissect_HSDSCH_Paging_System_InformationFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_PDSCH_TDD_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_PDSCH_TDD_Information_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ConfigurationGenerationID, new_create_dissector_handle(dissect_ConfigurationGenerationID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_PUCH_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_HICH_Information_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_Generated_ReceivedTotalWideBandPowerInOtherCells, new_create_dissector_handle(dissect_Maximum_Generated_ReceivedTotalWideBandPowerInOtherCells_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_PUCH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_HICH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_PUCH_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SYNC_UL_Partition_LCR, new_create_dissector_handle(dissect_SYNC_UL_Partition_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PDSCH_AddInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PDSCH_AddInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PDSCH_Timeslot_Format_PSCH_ReconfRqst_LCR, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PDSCH_ModifyInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_AddInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_AddInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_Timeslot_Format_PSCH_ReconfRqst_LCR, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PUSCH_ModifyInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_dL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_hS_SCCH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_hS_SCCH_InformationModify_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationModify_768_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_TimeOffset, new_create_dissector_handle(dissect_E_HICH_TimeOffset_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_TimeOffsetLCR, new_create_dissector_handle(dissect_E_HICH_TimeOffsetLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Common_System_Information_ResponseFDD, new_create_dissector_handle(dissect_HSDSCH_Common_System_Information_ResponseFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Paging_System_Information_ResponseFDD, new_create_dissector_handle(dissect_HSDSCH_Paging_System_Information_ResponseFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NSubCyclesPerCyclePeriod_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_NSubCyclesPerCyclePeriod_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SYNCDlCodeIdMeasReconfigurationLCR_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeIdMeasInfoLCR_CellSyncReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DwPCH_Power, new_create_dissector_handle(dissect_DwPCH_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimingAdjustmentValueLCR, new_create_dissector_handle(dissect_TimingAdjustmentValueLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_AccumulatedClockupdate_CellSyncReprtTDD, new_create_dissector_handle(dissect_TimingAdjustmentValue_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD, new_create_dissector_handle(dissect_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_E_DCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_FDD_Update_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Update_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPMulticastIndication, new_create_dissector_handle(dissect_IPMulticastIndication_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp, new_create_dissector_handle(dissect_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UARFCN_Adjustment, new_create_dissector_handle(dissect_UARFCN_Adjustment_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UPPCHPositionLCR, new_create_dissector_handle(dissect_UPPCHPositionLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UPPCH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_UPPCH_LCR_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UPPCH_LCR_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_UPPCH_LCR_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleFreq_dL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleFreq_HS_DSCH_Resources_InformationList_AuditRsp, new_create_dissector_handle(dissect_MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Extended_HS_SCCH_ID, new_create_dissector_handle(dissect_Extended_HS_SCCH_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Extended_HS_SICH_ID, new_create_dissector_handle(dissect_Extended_HS_SICH_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_InfoExt_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_InfoExt_DM_Rqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MBSFN_SpecialTimeSlot_LCR, new_create_dissector_handle(dissect_TimeslotLCR_Extension_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Paging_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Paging_MACFlows_to_DeleteFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_Target_ReceivedTotalWideBandPower_LCR, new_create_dissector_handle(dissect_Maximum_Target_ReceivedTotalWideBandPower_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPDCH_PowerInterpolation, new_create_dissector_handle(dissect_E_DPDCH_PowerInterpolation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_TFCI_Boost_Information, new_create_dissector_handle(dissect_E_TFCI_Boost_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Ext_Max_Bits_MACe_PDU_non_scheduled, new_create_dissector_handle(dissect_Ext_Max_Bits_MACe_PDU_non_scheduled_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Ext_Reference_E_TFCI_PO, new_create_dissector_handle(dissect_Ext_Reference_E_TFCI_PO_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HARQ_MemoryPartitioningInfoExtForMIMO, new_create_dissector_handle(dissect_HARQ_MemoryPartitioningInfoExtForMIMO_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IPMulticastDataBearerIndication, new_create_dissector_handle(dissect_IPMulticastDataBearerIndication_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_MIMO_ActivationIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_MIMO_Mode_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_N_M_Ratio, new_create_dissector_handle(dissect_MIMO_N_M_Ratio_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multicarrier_number, new_create_dissector_handle(dissect_Multicarrier_Number_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_number_Of_Supported_Carriers, new_create_dissector_handle(dissect_Number_Of_Supported_Carriers_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_multipleFreq_HSPDSCH_InformationList_ResponseTDDLCR, new_create_dissector_handle(dissect_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixtyfourQAM_UsageAllowedIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_UsageAllowedIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixtyfourQAM_DL_UsageIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_UsageIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixteenQAM_UL_Operation_Indicator, new_create_dissector_handle(dissect_SixteenQAM_UL_Operation_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TransportBearerNotRequestedIndicator, new_create_dissector_handle(dissect_TransportBearerNotRequestedIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TransportBearerNotSetupIndicator, new_create_dissector_handle(dissect_TransportBearerNotSetupIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_tSN_Length, new_create_dissector_handle(dissect_TSN_Length_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Extended_E_DCH_LCRTDD_PhysicalLayerCategory, new_create_dissector_handle(dissect_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp, new_create_dissector_handle(dissect_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Extended_E_HICH_ID_TDD, new_create_dissector_handle(dissect_Extended_E_HICH_ID_TDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_MACdPDU_SizeCapability, new_create_dissector_handle(dissect_E_DCH_MACdPDU_SizeCapability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_E_DCH_MACdPDUSizeFormat_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MaximumNumber_Of_Retransmission_for_Scheduling_Info_LCRTDD, new_create_dissector_handle(dissect_Maximum_Number_of_Retransmissions_For_E_DCH_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_RetransmissionTimer_for_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_TimeOffset_Extension, new_create_dissector_handle(dissect_E_HICH_TimeOffset_ExtensionLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_PUCH_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_TBSizeTableIndicator, new_create_dissector_handle(dissect_HSDSCH_TBSizeTableIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_DL_Control_Channel_Change_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Change_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_DL_Control_Channel_Grant_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Grant_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DGANSS_Corrections_Req, new_create_dissector_handle(dissect_DGANSS_Corrections_Req_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_AdditionalTimeSlotListLCR, new_create_dissector_handle(dissect_AdditionalTimeSlotListLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_AdditionalMeasurementValueList, new_create_dissector_handle(dissect_AdditionalMeasurementValueList_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_AGCH_Table_Choice, new_create_dissector_handle(dissect_E_AGCH_Table_Choice_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_Capability, new_create_dissector_handle(dissect_Common_EDCH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_AI_Capability, new_create_dissector_handle(dissect_E_AI_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_System_InformationFDD, new_create_dissector_handle(dissect_Common_EDCH_System_InformationFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_UL_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_MACdFlows_to_DeleteFDD, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_Delete_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_System_Information_ResponseFDD, new_create_dissector_handle(dissect_Common_EDCH_System_Information_ResponseFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_UE_DRX_Capability, new_create_dissector_handle(dissect_Enhanced_UE_DRX_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_UE_DRX_InformationFDD, new_create_dissector_handle(dissect_Enhanced_UE_DRX_InformationFDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TransportBearerRequestIndicator, new_create_dissector_handle(dissect_TransportBearerRequestIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_SixtyfourQAM_DL_MIMO_Combined_Capability, new_create_dissector_handle(dissect_SixtyfourQAM_DL_MIMO_Combined_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RNTI, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MinimumReducedE_DPDCH_GainFactor, new_create_dissector_handle(dissect_MinimumReducedE_DPDCH_GainFactor_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Time_ID, new_create_dissector_handle(dissect_GANSS_Time_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_AddNavigationModelsReq, new_create_dissector_handle(dissect_GANSS_AddNavigationModelsReq_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_AddUTCModelsReq, new_create_dissector_handle(dissect_GANSS_AddUTCModelsReq_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_AuxInfoReq, new_create_dissector_handle(dissect_GANSS_AuxInfoReq_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_ID, new_create_dissector_handle(dissect_GANSS_ID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DPCCH_Power_Boosting_Capability, new_create_dissector_handle(dissect_E_DPCCH_Power_Boosting_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Common_System_InformationLCR, new_create_dissector_handle(dissect_HSDSCH_Common_System_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Common_System_Information_ResponseLCR, new_create_dissector_handle(dissect_HSDSCH_Common_System_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Paging_System_InformationLCR, new_create_dissector_handle(dissect_HSDSCH_Paging_System_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_Paging_System_Information_ResponseLCR, new_create_dissector_handle(dissect_HSDSCH_Paging_System_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Paging_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Paging_MACFlows_to_DeleteLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_System_InformationLCR, new_create_dissector_handle(dissect_Common_EDCH_System_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_UL_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_MACdFlows_to_DeleteLCR, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_DeleteLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_EDCH_System_Information_ResponseLCR, new_create_dissector_handle(dissect_Common_EDCH_System_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_UE_DRX_CapabilityLCR, new_create_dissector_handle(dissect_Enhanced_UE_DRX_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Enhanced_UE_DRX_InformationLCR, new_create_dissector_handle(dissect_Enhanced_UE_DRX_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_PreconfigurationSetup, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationSetup_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSDSCH_PreconfigurationInfo, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationInfo_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NoOfTargetCellHS_SCCH_Order, new_create_dissector_handle(dissect_NoOfTargetCellHS_SCCH_Order_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_EnhancedHSServingCC_Abort, new_create_dissector_handle(dissect_EnhancedHSServingCC_Abort_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_RL_Setup, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Setup_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_Response_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_RL_Addition, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Addition_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Change_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Change_Information_Response_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Req_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_HS_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Param_Upd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Multi_Cell_Capability_Info, new_create_dissector_handle(dissect_Multi_Cell_Capability_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IMB_Parameters, new_create_dissector_handle(dissect_IMB_Parameters_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MACes_Maximum_Bitrate_LCR, new_create_dissector_handle(dissect_MACes_Maximum_Bitrate_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Semi_PersistentScheduling_CapabilityLCR, new_create_dissector_handle(dissect_Semi_PersistentScheduling_CapabilityLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivity_DRX_CapabilityLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_CapabilityLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivity_DRX_InformationLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_ContinuousPacketConnectivity_DRX_Information_ResponseLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CPC_InformationLCR, new_create_dissector_handle(dissect_CPC_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_AGCH_UE_Inactivity_Monitor_Threshold, new_create_dissector_handle(dissect_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_IdleIntervalInformation, new_create_dissector_handle(dissect_IdleIntervalInformation_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_ReferenceSignal_InformationLCR, new_create_dissector_handle(dissect_HSSICH_ReferenceSignal_InformationLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_ReferenceSignal_InformationListLCR, new_create_dissector_handle(dissect_MIMO_ReferenceSignal_InformationListLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_SFMode_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_SFMode_Supported_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UE_Selected_MBMS_Service_Information, new_create_dissector_handle(dissect_UE_Selected_MBMS_Service_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MultiCarrier_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_LCRTDD_HSDSCH_Physical_Layer_Category_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_E_DCH_HSDPCCH_Capability, new_create_dissector_handle(dissect_Common_E_DCH_HSDPCCH_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DL_RLC_PDU_Size_Format, new_create_dissector_handle(dissect_DL_RLC_PDU_Size_Format_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSICH_ReferenceSignal_InformationModifyLCR, new_create_dissector_handle(dissect_HSSICH_ReferenceSignal_InformationModifyLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_schedulingPriorityIndicator, new_create_dissector_handle(dissect_SchedulingPriorityIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TimeSlotMeasurementValueListLCR, new_create_dissector_handle(dissect_TimeSlotMeasurementValueListLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UE_SupportIndicatorExtension, new_create_dissector_handle(dissect_UE_SupportIndicatorExtension_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Single_Stream_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_ActivationIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Single_Stream_MIMO_Capability, new_create_dissector_handle(dissect_Single_Stream_MIMO_Capability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Single_Stream_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_Mode_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Dual_Band_Capability_Info, new_create_dissector_handle(dissect_Dual_Band_Capability_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UE_AggregateMaximumBitRate_Enforcement_Indicator, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_Power_Offset_For_S_CPICH_Capability, new_create_dissector_handle(dissect_MIMO_PowerOffsetForS_CPICHCapability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MIMO_PilotConfigurationExtension, new_create_dissector_handle(dissect_MIMO_PilotConfigurationExtension_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TxDiversityOnDLControlChannelsByMIMOUECapability, new_create_dissector_handle(dissect_TxDiversityOnDLControlChannelsByMIMOUECapability_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NumberOfReportedCellPortionsLCR, new_create_dissector_handle(dissect_NumberOfReportedCellPortionsLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_CellPortion_CapabilityLCR, new_create_dissector_handle(dissect_CellPortion_CapabilityLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Setup_Req, new_create_dissector_handle(dissect_Additional_EDCH_Setup_Info_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Add_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Add_Req_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_Response_RL_Add, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RL_Add_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_Bearer_Rearrangement, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Bearer_Rearrangement_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Param_Upd_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Preconfiguration_Information, new_create_dissector_handle(dissect_Additional_EDCH_Preconfiguration_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_EDCH_Indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_SPS_Reservation_Indicator, new_create_dissector_handle(dissect_SPS_Reservation_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_DCH_SPS_Reservation_Indicator, new_create_dissector_handle(dissect_SPS_Reservation_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MultipleFreq_HARQ_MemoryPartitioning_InformationList, new_create_dissector_handle(dissect_MultipleFreq_HARQ_MemoryPartitioning_InformationList_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext, new_create_dissector_handle(dissect_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_RepetitionPeriodIndex, new_create_dissector_handle(dissect_RepetitionPeriodIndex_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MidambleShiftLCR, new_create_dissector_handle(dissect_MidambleShiftLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_MaxHSDSCH_HSSCCH_Power_per_CELLPORTION, new_create_dissector_handle(dissect_MaxHSDSCH_HSSCCH_Power_per_CELLPORTION_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DormantModeIndicator, new_create_dissector_handle(dissect_DormantModeIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DiversityMode, new_create_dissector_handle(dissect_DiversityMode_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TransmitDiversityIndicator, new_create_dissector_handle(dissect_TransmitDiversityIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_NonCellSpecificTxDiversity, new_create_dissector_handle(dissect_NonCellSpecificTxDiversity_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Cell_Capability_Container, new_create_dissector_handle(dissect_Cell_Capability_Container_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RNTI_List_Request, new_create_dissector_handle(dissect_NULL_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_RNTI_List, new_create_dissector_handle(dissect_E_RNTI_List_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PowerControlGAP_For_CellFACHLCR, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UL_Synchronisation_Parameters_For_FACHLCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HS_DSCH_SPS_Operation_Indicator, new_create_dissector_handle(dissect_HS_DSCH_SPS_Operation_Indicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Out_of_Sychronization_Window, new_create_dissector_handle(dissect_Out_of_Sychronization_Window_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_E_HICH_TimeOffset_ReconfFailureTDD, new_create_dissector_handle(dissect_E_HICH_TimeOffset_ReconfFailureTDD_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_HSSCCH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_TS0_CapabilityLCR, new_create_dissector_handle(dissect_TS0_CapabilityLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_UE_TS0_CapabilityLCR, new_create_dissector_handle(dissect_UE_TS0_CapabilityLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Common_System_Information_ResponseLCR, new_create_dissector_handle(dissect_Common_System_Information_ResponseLCR_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Additional_EDCH_Cell_Information_ResponseRLReconf, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLReconf_List_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Multicell_EDCH_InformationItemIEs, new_create_dissector_handle(dissect_Multicell_EDCH_InformationItemIEs_PDU, proto_nbap));
-  dissector_add("nbap.ies", id_Multicell_EDCH_RL_Specific_InformationItemIEs, new_create_dissector_handle(dissect_Multicell_EDCH_RL_Specific_InformationItemIEs_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Modify_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Initial_DL_Transmission_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Maximum_DL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_Minimum_DL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DCH_MeasurementOccasion_Information, new_create_dissector_handle(dissect_DCH_MeasurementOccasion_Information_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_AssociatedPhsicalChannelID, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PhysicalChannelID_for_CommonERNTI_RequestedIndicator, new_create_dissector_handle(dissect_PhysicalChannelID_for_CommonERNTI_RequestedIndicator_PDU, proto_nbap));
-  dissector_add("nbap.extension", id_PrecodingWeightSetRestriction, new_create_dissector_handle(dissect_PrecodingWeightSetRestriction_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TUTRANGPSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementValueInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SFNSFNMeasurementValueInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementValueInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHRequiredPowerValueInformation, new_create_dissector_handle(dissect_HS_DSCHRequiredPower_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRate_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion_Value, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_For_CellPortion_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_total_wide_band_power_For_CellPortion_Value, new_create_dissector_handle(dissect_Received_total_wide_band_power_For_CellPortion_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UpPTSInterferenceValue, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DLTransmissionBranchLoadValue, new_create_dissector_handle(dissect_DLTransmissionBranchLoadValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHRequiredPowerValueInformation_For_CellPortion, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValueInformation_For_CellPortion_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation_For_CellPortion, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRateValueInformation_For_CellPortion_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_DCHProvidedBitRateValueInformation, new_create_dissector_handle(dissect_E_DCHProvidedBitRate_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_DCH_Non_serving_Relative_Grant_Down_CommandsValue, new_create_dissector_handle(dissect_E_DCH_Non_serving_Relative_Grant_Down_Commands_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_Value, new_create_dissector_handle(dissect_Received_Scheduled_EDCH_Power_Share_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value, new_create_dissector_handle(dissect_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TUTRANGANSSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementValueInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Rx_Timing_Deviation_Value_LCR, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Angle_Of_Arrival_Value_LCR, new_create_dissector_handle(dissect_Angle_Of_Arrival_Value_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_SICH_Reception_Quality, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Best_Cell_Portions_Value, new_create_dissector_handle(dissect_Best_Cell_Portions_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Rx_Timing_Deviation_Value_768, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Rx_Timing_Deviation_Value_384_ext, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_384_ext_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Extended_Round_Trip_Time_Value, new_create_dissector_handle(dissect_Extended_Round_Trip_Time_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_neighbouringTDDCellMeasurementInformationLCR, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_neighbouringTDDCellMeasurementInformation768, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformation768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ReportCharacteristicsType_OnModification, new_create_dissector_handle(dissect_ReportCharacteristicsType_OnModification_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_total_wide_band_power_For_CellPortion, new_create_dissector_handle(dissect_Received_total_wide_band_power_Value_IncrDecrThres_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortion, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_Scheduled_EDCH_Power_Share, new_create_dissector_handle(dissect_RSEPS_Value_IncrDecrThres_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TUTRANGPSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementThresholdInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SFNSFNMeasurementThresholdInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementThresholdInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHRequiredPowerValue, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHRequiredPowerValue_For_Cell_Portion, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_Scheduled_EDCH_Power_Share_For_CellPortion, new_create_dissector_handle(dissect_RSEPS_Value_IncrDecrThres_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Additional_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TUTRANGANSSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementThresholdInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ConfigurationGenerationID, new_create_dissector_handle(dissect_ConfigurationGenerationID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonPhysicalChannelType_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_ParametersListIE_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_ParametersItem_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RACH_ParametersItem_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_RACH_ParametersItem_CTCH_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonPhysicalChannelType_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_ParametersListIE_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PICH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PICH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_LCR_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACH_ParametersItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RACH_ParameterItem_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_RACH_ParameterItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_ParametersList_CTCH_SetupRsp, new_create_dissector_handle(dissect_FACH_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_Parameters_CTCH_SetupRsp, new_create_dissector_handle(dissect_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RACH_Parameters_CTCH_SetupRsp, new_create_dissector_handle(dissect_CommonTransportChannel_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonPhysicalChannelType_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_CommonPhysicalChannelType_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_FACH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_ParametersItem_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PCH_ParametersItem_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PICH_ParametersItem_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PICH_ParametersItem_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_PRACH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_AICH_ParametersListIE_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_AICH_ParametersListIE_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PICH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PICH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_ParametersList_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_FACH_ParametersList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonPhysicalChannelID, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_BlockingPriorityIndicator, new_create_dissector_handle(dissect_BlockingPriorityIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ShutdownTimer, new_create_dissector_handle(dissect_ShutdownTimer_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Start_Of_Audit_Sequence_Indicator, new_create_dissector_handle(dissect_Start_Of_Audit_Sequence_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_End_Of_Audit_Sequence_Indicator, new_create_dissector_handle(dissect_End_Of_Audit_Sequence_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_InformationList_AuditRsp, new_create_dissector_handle(dissect_Cell_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CCP_InformationList_AuditRsp, new_create_dissector_handle(dissect_CCP_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_InformationList_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_Group_InformationList_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_Group_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Cell_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_P_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_S_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_P_CPICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_S_CPICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_P_CCPCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_BCH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_S_CCPCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FACH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RACH_Information, new_create_dissector_handle(dissect_Common_TransportChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_AICH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CCP_InformationItem_AuditRsp, new_create_dissector_handle(dissect_CCP_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FPACH_LCR_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_S_CCPCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACH_768_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_Group_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_InformationItem_AuditRsp, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PLCCH_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_RUCCH_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_RUCCH_768_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MeasurementID, new_create_dissector_handle(dissect_MeasurementID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonMeasurementObjectType_CM_Rqst, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonMeasurementType, new_create_dissector_handle(dissect_CommonMeasurementType_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MeasurementFilterCoefficient, new_create_dissector_handle(dissect_MeasurementFilterCoefficient_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SFN, new_create_dissector_handle(dissect_SFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rqst, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonMeasurementObjectType_CM_Rsp, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rsp, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommonMeasurementObjectType_CM_Rprt, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_choice_CM_Rprt, new_create_dissector_handle(dissect_PowerLocalCellGroup_CM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_ID, new_create_dissector_handle(dissect_Local_Cell_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_T_Cell, new_create_dissector_handle(dissect_T_Cell_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UARFCNforNu, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UARFCNforNd, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MaximumTransmissionPower, new_create_dissector_handle(dissect_MaximumTransmissionPower_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Closed_Loop_Timing_Adjustment_Mode, new_create_dissector_handle(dissect_Closedlooptimingadjustmentmode_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimaryScramblingCode, new_create_dissector_handle(dissect_PrimaryScramblingCode_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Synchronisation_Configuration_Cell_SetupRqst, new_create_dissector_handle(dissect_Synchronisation_Configuration_Cell_SetupRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_TPC_Pattern01Count, new_create_dissector_handle(dissect_DL_TPC_Pattern01Count_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimarySCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimarySCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondarySCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondarySCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimaryCPICH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimaryCPICH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondaryCPICH_InformationList_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationList_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimaryCCPCH_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_PrimaryCCPCH_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Limited_power_increase_information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_Limited_power_increase_information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondaryCPICH_InformationItem_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationItem_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellPortion_InformationItem_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationItem_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UARFCNforNt, new_create_dissector_handle(dissect_UARFCN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellParameterID, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmissionDiversityApplied, new_create_dissector_handle(dissect_TransmissionDiversityApplied_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SyncCase, new_create_dissector_handle(dissect_SyncCase_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DPCHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PRACHConstant, new_create_dissector_handle(dissect_ConstantValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TimingAdvanceApplied, new_create_dissector_handle(dissect_TimingAdvanceApplied_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SCH_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_SCH_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCCPCH_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TimeSlotConfigurationList_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH, new_create_dissector_handle(dissect_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Synchronisation_Configuration_Cell_ReconfRqst, new_create_dissector_handle(dissect_Synchronisation_Configuration_Cell_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimarySCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimarySCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondarySCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondarySCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimaryCPICH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimaryCPICH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PrimaryCCPCH_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_PrimaryCCPCH_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellPortion_InformationItem_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationItem_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SCH_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_SCH_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PCCPCH_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_PCCPCH_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TimeSlotConfigurationList_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_IndicationType_ResourceStatusInd, new_create_dissector_handle(dissect_IndicationType_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_Group_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Local_Cell_Group_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Power_Local_Cell_Group_InformationItem2_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CCP_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_CCP_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FPACH_LCR_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DwPCH_LCR_Information, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PLCCH_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_S_CCPCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_BCCH_ModificationTime, new_create_dissector_handle(dissect_BCCH_ModificationTime_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst, new_create_dissector_handle(dissect_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SegmentInformationListIE_SystemInfoUpdate, new_create_dissector_handle(dissect_SegmentInformationListIE_SystemInfoUpdate_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CRNC_CommunicationContextID, new_create_dissector_handle(dissect_CRNC_CommunicationContextID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_FDD_Information, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationList_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Transmission_Gap_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Transmission_Gap_Pattern_Sequence_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Active_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Active_Pattern_Sequence_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_TDD_Information, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCH_TDD_Information, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_Information, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_NodeB_CommunicationContextID, new_create_dissector_handle(dissect_NodeB_CommunicationContextID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommunicationControlPortID, new_create_dissector_handle(dissect_CommunicationControlPortID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseList_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_SetupRspFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseItem_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_SetupRspFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCH_InformationResponse, new_create_dissector_handle(dissect_DSCH_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_InformationResponse, new_create_dissector_handle(dissect_USCH_InformationResponse_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_RL_SetupFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Successful_RL_InformationRespItem_RL_SetupFailureFDD, new_create_dissector_handle(dissect_Successful_RL_InformationRespItem_RL_SetupFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_RL_SetupFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_RL_InformationResp_RL_SetupFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationResp_RL_SetupFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Compressed_Mode_Deactivation_Flag, new_create_dissector_handle(dissect_Compressed_Mode_Deactivation_Flag_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationList_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_AdditionRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_AdditionRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseList_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_AdditionRspFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseItem_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_AdditionRspFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Successful_RL_InformationRespItem_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_Successful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_FDD_DCHs_to_Modify, new_create_dissector_handle(dissect_FDD_DCHs_to_Modify_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCHs_to_Add_FDD, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_DeleteList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TDD_DCHs_to_Modify, new_create_dissector_handle(dissect_TDD_DCHs_to_Modify_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCHs_to_Add_TDD, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCH_Information_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_Information_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCHs_to_Add_TDD, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCH_Information_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_Information_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_Information_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_Information_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_Information_Add, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_Information_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_Information_DeleteList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationModify_AddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationModify_ModifyListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationModify_AddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationModify_ModifyListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseList_RL_ReconfReady, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfReady_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseItem_RL_ReconfReady, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfReady_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_RL_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_RL_ReconfFailure_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_ReconfigurationFailureItem_RL_ReconfFailure, new_create_dissector_handle(dissect_RL_ReconfigurationFailureItem_RL_ReconfFailure_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_DeleteList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_DeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Information_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseList_RL_ReconfRsp, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationResponseItem_RL_ReconfRsp, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_informationList_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_informationList_RL_DeletionRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_informationItem_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_informationItem_RL_DeletionRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PowerAdjustmentType, new_create_dissector_handle(dissect_PowerAdjustmentType_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InnerLoopDLPCStatus, new_create_dissector_handle(dissect_InnerLoopDLPCStatus_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DLReferencePowerList_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MaxAdjustmentStep, new_create_dissector_handle(dissect_MaxAdjustmentStep_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_AdjustmentPeriod, new_create_dissector_handle(dissect_AdjustmentPeriod_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_AdjustmentRatio, new_create_dissector_handle(dissect_ScaledAdjustmentRatio_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DL_ReferencePowerInformationItem_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationItem_DL_PC_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TimeslotISCPInfo, new_create_dissector_handle(dissect_DL_TimeslotISCPInfo_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rqst, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DedicatedMeasurementType, new_create_dissector_handle(dissect_DedicatedMeasurementType_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rsp, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Set_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DedicatedMeasurementObjectType_DM_Rprt, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Set_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Reporting_Object_RL_FailureInd, new_create_dissector_handle(dissect_Reporting_Object_RL_FailureInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_FailureInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Set_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_RL_Set_InformationItem_RL_FailureInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CCTrCH_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_FailureInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationList_RL_PreemptRequiredInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_PreemptRequiredInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Reporting_Object_RL_RestoreInd, new_create_dissector_handle(dissect_Reporting_Object_RL_RestoreInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_RestoreInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_RL_Set_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Set_InformationItem_RL_RestoreInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CCTrCH_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_RestoreInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_PDSCH_HS_SCCH_E_AGCH_E_RGCH_E_HICH_MaxPower_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MaximumTransmissionPower_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_PDSCH_HS_SCCH_ScramblingCode_PSCH_ReconfRqst, new_create_dissector_handle(dissect_DL_ScramblingCode_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_PDSCH_FDD_Code_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_PDSCH_FDD_Code_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_SCCH_FDD_Code_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_FDD_Code_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCHSets_AddList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_AddList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCHSets_ModifyList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_ModifyList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCHSets_DeleteList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCHSets_DeleteList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCHSets_AddList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_AddList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCHSets_ModifyList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_ModifyList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCHSets_DeleteList_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCHSets_DeleteList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCH_Information_AddListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_Information_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCH_Information_ModifyListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PDSCH_ModifyInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCH_Information_AddListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_Information_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCH_Information_ModifyListIE_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PUSCH_ModifyInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_PSCH_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_PSCH_ReconfFailure_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ResetIndicator, new_create_dissector_handle(dissect_ResetIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommunicationContextInfoItem_Reset, new_create_dissector_handle(dissect_CommunicationContextInfoItem_Reset_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CommunicationControlPortInfoItem_Reset, new_create_dissector_handle(dissect_CommunicationControlPortInfoItem_Reset_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_cellSyncBurstRepetitionPeriod, new_create_dissector_handle(dissect_CellSyncBurstRepetitionPeriod_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_timeslotInfo_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_TimeslotInfo_CellSyncInitiationRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncBurstTransInit_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstTransInit_CellSyncInitiationRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TimeSlot, new_create_dissector_handle(dissect_TimeSlot_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_NCyclesPerSFNperiod, new_create_dissector_handle(dissect_NCyclesPerSFNperiod_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_NRepetitionsPerCyclePeriod, new_create_dissector_handle(dissect_NRepetitionsPerCyclePeriod_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncBurstMeasReconfiguration_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasInfo_CellSyncReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncBurstMeasInfoList_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SynchronisationReportType, new_create_dissector_handle(dissect_SynchronisationReportType_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SynchronisationReportCharacteristics, new_create_dissector_handle(dissect_SynchronisationReportCharacteristics_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellAdjustmentInfo_SyncAdjustmntRqstTDD, new_create_dissector_handle(dissect_CellAdjustmentInfo_SyncAdjustmentRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellAdjustmentInfoItem_SyncAdjustmentRqstTDD, new_create_dissector_handle(dissect_CellAdjustmentInfoItem_SyncAdjustmentRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CauseLevel_SyncAdjustmntFailureTDD, new_create_dissector_handle(dissect_CauseLevel_SyncAdjustmntFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CSBTransmissionID, new_create_dissector_handle(dissect_CSBTransmissionID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CSBMeasurementID, new_create_dissector_handle(dissect_CSBMeasurementID_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_CellSyncInfo_CellSyncReprtTDD, new_create_dissector_handle(dissect_CellSyncInfo_CellSyncReprtTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SyncReportType_CellSyncReprtTDD, new_create_dissector_handle(dissect_SyncReportType_CellSyncReprtTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_SignallingBearerRequestIndicator, new_create_dissector_handle(dissect_SignallingBearerRequestIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_DCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DSCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_DSCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_USCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_USCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HSDSCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_HSDSCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DelayedActivationList_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DelayedActivationInformation_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DelayedActivationList_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_DelayedActivationInformation_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HSDSCH_FDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Update_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HSDSCH_TDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Update_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Modification_Period, new_create_dissector_handle(dissect_Modification_Period_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MICH_CFN, new_create_dissector_handle(dissect_MICH_CFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_NI_Information_NotifUpdateCmd, new_create_dissector_handle(dissect_NI_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp, new_create_dissector_handle(dissect_Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UPPCH_LCR_InformationItem_AuditRsp, new_create_dissector_handle(dissect_UPPCH_LCR_InformationItem_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UPPCH_LCR_InformationItem_ResourceStatusInd, new_create_dissector_handle(dissect_UPPCH_LCR_InformationItem_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD, new_create_dissector_handle(dissect_Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UARFCNSpecificCauseList, new_create_dissector_handle(dissect_UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_MultipleFreq_E_HICH_TimeOffsetLCR, new_create_dissector_handle(dissect_MultipleFreq_E_HICH_TimeOffsetLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_PLCCH_parameters, new_create_dissector_handle(dissect_PLCCH_parameters_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_RUCCH_parameters, new_create_dissector_handle(dissect_E_RUCCH_parameters_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_RUCCH_768_parameters, new_create_dissector_handle(dissect_E_RUCCH_768_parameters_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Cell_ERNTI_Status_Information, new_create_dissector_handle(dissect_Cell_ERNTI_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ERACH_CM_Rqst, new_create_dissector_handle(dissect_ERACH_CM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ERACH_CM_Rsp, new_create_dissector_handle(dissect_ERACH_CM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ERACH_CM_Rprt, new_create_dissector_handle(dissect_ERACH_CM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_EDCH_RACH_Report_Value, new_create_dissector_handle(dissect_EDCH_RACH_Report_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_EDCH_RACH_Report_IncrDecrThres, new_create_dissector_handle(dissect_EDCH_RACH_Report_IncrDecrThres_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_EDCH_RACH_Report_ThresholdInformation, new_create_dissector_handle(dissect_EDCH_RACH_Report_ThresholdInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_NAVKeplerianSet_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ReducedKeplerianSet_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_MidiAlmanacSet_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_ALM_GlonassAlmanacSet_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ECEFsbasAlmanacSet_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ULTimeslotISCPValue_For_CellPortion, new_create_dissector_handle(dissect_UL_TimeslotISCP_Value_IncrDecrThres_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UpPTSInterferenceValue_For_CellPortion, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Best_Cell_Portions_ValueLCR, new_create_dissector_handle(dissect_Best_Cell_Portions_ValueLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Transmitted_Carrier_Power_For_CellPortion_ValueLCR, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_For_CellPortion_ValueLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Received_total_wide_band_power_For_CellPortion_ValueLCR, new_create_dissector_handle(dissect_Received_total_wide_band_power_For_CellPortion_ValueLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UL_TimeslotISCP_For_CellPortion_Value, new_create_dissector_handle(dissect_UL_TimeslotISCP_For_CellPortion_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR, new_create_dissector_handle(dissect_HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR, new_create_dissector_handle(dissect_HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_E_DCHProvidedBitRateValueInformation_For_CellPortion, new_create_dissector_handle(dissect_E_DCHProvidedBitRateValueInformation_For_CellPortion_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_UpPTSInterference_For_CellPortion_Value, new_create_dissector_handle(dissect_UpPTSInterference_For_CellPortion_Value_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortion, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_ActivationInformation, new_create_dissector_handle(dissect_ActivationInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_BroadcastCommonTransportBearerIndication, new_create_dissector_handle(dissect_BroadcastCommonTransportBearerIndication_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TnlQos, new_create_dissector_handle(dissect_TnlQos_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Unidirectional_DCH_Indicator, new_create_dissector_handle(dissect_Unidirectional_DCH_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ExtendedPropagationDelay, new_create_dissector_handle(dissect_ExtendedPropagationDelay_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Initial_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_bindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_transportlayeraddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_PowerOffset_for_SchedulingInfo, new_create_dissector_handle(dissect_E_DCH_PowerOffset_for_SchedulingInfo_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SAT_Info_Almanac_ExtItem, new_create_dissector_handle(dissect_SAT_Info_Almanac_ExtList_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HARQ_Preamble_Mode, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_HSDSCH_MACdPDUSizeFormat_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ueCapability_Info, new_create_dissector_handle(dissect_UE_Capability_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_PDSCH_Code_Change_Grant, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Grant_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HARQ_Preamble_Mode_Activation_Indicator, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_Activation_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_hsSCCH_Specific_Information_ResponseTDD768, new_create_dissector_handle(dissect_HSSCCH_Specific_InformationRespListTDD768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MaximumMACdPDU_SizeExtended, new_create_dissector_handle(dissect_MAC_PDU_SizeExtended_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_failed_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_failed_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_missed_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_missed_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_total_HS_SICH, new_create_dissector_handle(dissect_HS_SICH_total_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Information, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Information_Response, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Information_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_PDSCH_Code_Change_Indicator, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Information, new_create_dissector_handle(dissect_GANSS_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Common_Data, new_create_dissector_handle(dissect_GANSS_Common_Data_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Generic_Data, new_create_dissector_handle(dissect_GANSS_Generic_Data_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SyncDLCodeIdThreInfoLCR, new_create_dissector_handle(dissect_SyncDLCodeIdThreInfoLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_LCRTDD_uplink_Physical_Channel_Capability, new_create_dissector_handle(dissect_LCRTDD_Uplink_Physical_Channel_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PLCCH_Information_UL_TimeslotLCR_Info, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Parameters_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_FDD_S_CCPCH_FrameOffset_CTCH_SetupRqstFDD, new_create_dissector_handle(dissect_FDD_S_CCPCH_FrameOffset_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ModulationPO_MBSFN, new_create_dissector_handle(dissect_ModulationPO_MBSFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Secondary_CCPCH_SlotFormat_Extended, new_create_dissector_handle(dissect_Secondary_CCPCH_SlotFormat_Extended_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_BroadcastReference, new_create_dissector_handle(dissect_BroadcastReference_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Tstd_indicator, new_create_dissector_handle(dissect_TSTD_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_S_CCPCH_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterExtendedList_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_S_CCPCH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_768_parameterList_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_Modulation, new_create_dissector_handle(dissect_ModulationMBSFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_tFCI_Presence, new_create_dissector_handle(dissect_TFCI_Presence_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_maxFACH_Power_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PCH_Power_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PICH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PICH_768_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_FPACH_LCR_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_FPACH_LCR_Parameters_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PRACH_768_Parameters_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_PRACH_768_ParametersItem_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Parameters_CTCH_ReconfRqstFDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_FPACH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_FPACH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_MICH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PLCCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PLCCH_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PICH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_PICH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_768_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_MICH_768_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_S_CCPCH_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_S_CCPCH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_maxFACH_Power_LCR_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PCH_Power_LCR_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CommonPhysicalChannelID768_CommonTrChDeletionReq, new_create_dissector_handle(dissect_CommonPhysicalChannelID768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Power_Local_Cell_Group_InformationList_AuditRsp, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_FPACH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_FPACH_LCR_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DwPCH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Resources_Information_AuditRsp, new_create_dissector_handle(dissect_HS_DSCH_Resources_Information_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_InformationListExt_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_InformationListExt_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_LCR_InformationListExt_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_LCR_InformationListExt_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Resources_Information_AuditRsp, new_create_dissector_handle(dissect_E_DCH_Resources_Information_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PLCCH_InformationList_AuditRsp, new_create_dissector_handle(dissect_PLCCH_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_P_CCPCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_S_CCPCH_768_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PICH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PRACH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_PRACH_768_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SCH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_768_Information_AuditRsp, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RUCCH_InformationList_AuditRsp, new_create_dissector_handle(dissect_E_RUCCH_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RUCCH_768_InformationList_AuditRsp, new_create_dissector_handle(dissect_E_RUCCH_768_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ReferenceClockAvailability, new_create_dissector_handle(dissect_ReferenceClockAvailability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Power_Local_Cell_Group_ID, new_create_dissector_handle(dissect_Local_Cell_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDPA_Capability, new_create_dissector_handle(dissect_HSDPA_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Capability, new_create_dissector_handle(dissect_E_DCH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_TTI2ms_Capability, new_create_dissector_handle(dissect_E_DCH_TTI2ms_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_SF_Capability, new_create_dissector_handle(dissect_E_DCH_SF_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_HARQ_Combining_Capability, new_create_dissector_handle(dissect_E_DCH_HARQ_Combining_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_CapacityConsumptionLaw, new_create_dissector_handle(dissect_E_DCHCapacityConsumptionLaw_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_F_DPCH_Capability, new_create_dissector_handle(dissect_F_DPCH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_TDD_CapacityConsumptionLaw, new_create_dissector_handle(dissect_E_DCH_TDD_CapacityConsumptionLaw_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityDTX_DRX_Capability, new_create_dissector_handle(dissect_ContinuousPacketConnectivityDTX_DRX_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Max_UE_DTX_Cycle, new_create_dissector_handle(dissect_Max_UE_DTX_Cycle_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Capability, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_Capability, new_create_dissector_handle(dissect_MIMO_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixtyfourQAM_DL_Capability, new_create_dissector_handle(dissect_SixtyfourQAM_DL_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBMS_Capability, new_create_dissector_handle(dissect_MBMS_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_FACH_Capability, new_create_dissector_handle(dissect_Enhanced_FACH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_PCH_Capability, new_create_dissector_handle(dissect_Enhanced_PCH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixteenQAM_UL_Capability, new_create_dissector_handle(dissect_SixteenQAM_UL_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_MACdPDU_SizeCapability, new_create_dissector_handle(dissect_HSDSCH_MACdPDU_SizeCapability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_F_DPCH_SlotFormatCapability, new_create_dissector_handle(dissect_F_DPCH_SlotFormatCapability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CommonMeasurementAccuracy, new_create_dissector_handle(dissect_CommonMeasurementAccuracy_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MeasurementRecoveryBehavior, new_create_dissector_handle(dissect_MeasurementRecoveryBehavior_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RTWP_ReportingIndicator, new_create_dissector_handle(dissect_RTWP_ReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RTWP_CellPortion_ReportingIndicator, new_create_dissector_handle(dissect_RTWP_CellPortion_ReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Reference_ReceivedTotalWideBandPowerReporting, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPowerReporting_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeSlotLCR_CM_Rqst, new_create_dissector_handle(dissect_TimeSlotLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NeighbouringCellMeasurementInformation, new_create_dissector_handle(dissect_NeighbouringCellMeasurementInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MeasurementRecoverySupportIndicator, new_create_dissector_handle(dissect_MeasurementRecoverySupportIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Reference_ReceivedTotalWideBandPowerSupportIndicator, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPowerSupportIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Reference_ReceivedTotalWideBandPower, new_create_dissector_handle(dissect_Reference_ReceivedTotalWideBandPower_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MeasurementRecoveryReportingIndicator, new_create_dissector_handle(dissect_MeasurementRecoveryReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CellPortion_InformationList_Cell_SetupRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationList_Cell_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_PilotConfiguration, new_create_dissector_handle(dissect_MIMO_PilotConfiguration_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PCCPCH_LCR_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_LCR_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DwPCH_LCR_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_DwPCH_LCR_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ReferenceSFNoffset, new_create_dissector_handle(dissect_ReferenceSFNoffset_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_LCR_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_LCR_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PCCPCH_768_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_PCCPCH_768_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SCH_768_Information_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_SCH_768_Information_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBSFN_Only_Mode_Indicator_Cell_SetupRqstTDD_LCR, new_create_dissector_handle(dissect_MBSFN_Only_Mode_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBSFN_Cell_ParameterID_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Time_Slot_Parameter_ID, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CellPortion_InformationList_Cell_ReconfRqstFDD, new_create_dissector_handle(dissect_CellPortion_InformationList_Cell_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DwPCH_LCR_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_DwPCH_LCR_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPDLParameter_Information_LCR_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_IPDLParameter_Information_LCR_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SCH_768_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_SCH_768_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PCCPCH_768_Information_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_PCCPCH_768_Information_Cell_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBSFN_Cell_ParameterID_Cell_ReconfRqstTDD, new_create_dissector_handle(dissect_CellParameterID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Power_Local_Cell_Group_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBSFN_Only_Mode_Capability, new_create_dissector_handle(dissect_MBSFN_Only_Mode_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Power_Local_Cell_Group_InformationList2_ResourceStatusInd, new_create_dissector_handle(dissect_Power_Local_Cell_Group_InformationList2_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_FPACH_LCR_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_FPACH_LCR_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DwPCH_LCR_Information_ResourceStatusInd, new_create_dissector_handle(dissect_DwPCH_LCR_Information_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Resources_Information_ResourceStatusInd, new_create_dissector_handle(dissect_HS_DSCH_Resources_Information_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_InformationListExt_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_InformationListExt_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_LCR_InformationListExt_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_LCR_InformationListExt_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Resources_Information_ResourceStatusInd, new_create_dissector_handle(dissect_E_DCH_Resources_Information_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PLCCH_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_PLCCH_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_P_CCPCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_S_CCPCH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_S_CCPCH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PICH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PRACH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_PRACH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SCH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MICH_768_Information_ResourceStatusInd, new_create_dissector_handle(dissect_Common_PhysicalChannel_Status_Information768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RUCCH_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_E_RUCCH_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RUCCH_768_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_E_RUCCH_768_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_PowerBalancing_Information, new_create_dissector_handle(dissect_DL_PowerBalancing_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_FDD_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_RNTI, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSPDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_FDD_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Serving_E_DCH_RL_ID, new_create_dissector_handle(dissect_Serving_E_DCH_RL_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_F_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_SetupRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Initial_DL_DPCH_TimingAdjustment_Allowed, new_create_dissector_handle(dissect_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DCH_Indicator_For_E_DCH_HSDPA_Operation, new_create_dissector_handle(dissect_DCH_Indicator_For_E_DCH_HSDPA_Operation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Serving_Cell_Change_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityDTX_DRX_Information, new_create_dissector_handle(dissect_ContinuousPacketConnectivityDTX_DRX_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DPC_Mode, new_create_dissector_handle(dissect_DPC_Mode_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPDCH_Indicator_For_E_DCH_Operation, new_create_dissector_handle(dissect_UL_DPDCH_Indicator_For_E_DCH_Operation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RL_Specific_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_DCH_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DelayedActivation, new_create_dissector_handle(dissect_DelayedActivation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Primary_CPICH_Usage_for_Channel_Estimation, new_create_dissector_handle(dissect_Primary_CPICH_Usage_for_Channel_Estimation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Secondary_CPICH_Information, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_RL_Indication, new_create_dissector_handle(dissect_E_DCH_RL_Indication_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RL_Specific_E_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_E_DCH_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SynchronisationIndicator, new_create_dissector_handle(dissect_SynchronisationIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_F_DPCH_SlotFormat, new_create_dissector_handle(dissect_F_DPCH_SlotFormat_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_TDD_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Information, new_create_dissector_handle(dissect_E_DCH_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Serving_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_768_Information, new_create_dissector_handle(dissect_E_DCH_768_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_LCR_Information, new_create_dissector_handle(dissect_E_DCH_LCR_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_768_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_768_Information_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Maximum_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Minimum_DL_Power_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_768_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_768_Information_RL_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeslotISCP_LCR_InfoList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_Synchronisation_Parameters_LCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_FDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_PowerBalancing_ActivationIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_ActivationIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_RL_Set_ID, new_create_dissector_handle(dissect_RL_Set_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_FDD_DL_Control_Channel_Information, new_create_dissector_handle(dissect_E_DCH_FDD_DL_Control_Channel_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Initial_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_FDD_Information_Response, new_create_dissector_handle(dissect_E_DCH_FDD_Information_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RL_InformationResponse_LCR_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_LCR_RL_SetupRspTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_TDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Information_Response, new_create_dissector_handle(dissect_E_DCH_Information_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_Serving_Cell_Change_Info, new_create_dissector_handle(dissect_HS_DSCH_Serving_Cell_Change_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPCH_Information_RL_AdditionReqFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_AdditionReqFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Configured_Indicator, new_create_dissector_handle(dissect_HSDSCH_Configured_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_InformationItem_768_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_DownlinkStepSize_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Maximum_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Minimum_DL_Power_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_InformationItem_768_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeslotISCP_InformationList_LCR_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_Serving_Cell_Change_Info_Response, new_create_dissector_handle(dissect_HS_DSCH_Serving_Cell_Change_Info_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Serving_Cell_Change_Info_Response, new_create_dissector_handle(dissect_E_DCH_Serving_Cell_Change_Info_Response_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MAChs_ResetIndicator, new_create_dissector_handle(dissect_MAChs_ResetIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RL_InformationResponse_LCR_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_LCR_RL_AdditionRspTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SignallingBearerRequestIndicator, new_create_dissector_handle(dissect_SignallingBearerRequestIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Information_to_Modify, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_to_Delete_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_FDD_Information_to_Modify, new_create_dissector_handle(dissect_E_DCH_FDD_Information_to_Modify_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_E_DCH_MACdFlows_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_Delete_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_F_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Fast_Reconfiguration_Mode, new_create_dissector_handle(dissect_Fast_Reconfiguration_Mode_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CPC_Information, new_create_dissector_handle(dissect_CPC_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_Power_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Secondary_CPICH_Information_Change, new_create_dissector_handle(dissect_Secondary_CPICH_Information_Change_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_MultipleRL_Information_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_Information_Reconfig_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_768_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_768_Information_Reconfig_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_LCR_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Reconfig_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_UplinkStepSize_InformationAdd_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleRL_ul_DPCH_InformationList, new_create_dissector_handle(dissect_MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_768_InformationAddItemIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_768_InformationAddListIE_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_LCR_InformationModify_AddList, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_UplinkStepSize_InformationModify_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleRL_ul_DPCH_InformationModifyList, new_create_dissector_handle(dissect_MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_768_InformationModify_AddItem, new_create_dissector_handle(dissect_UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_768_InformationModify_AddList, new_create_dissector_handle(dissect_UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_TimeslotLCR_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_Timeslot768_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_Timeslot768_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PLCCH_Information_RL_ReconfPrepTDDLCR, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_DPCH_TimeSlotFormat_LCR_ModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Initial_DL_Power_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_DownlinkStepSize_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleRL_dl_DPCH_InformationList, new_create_dissector_handle(dissect_MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_768_InformationAddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TDD_TPC_DownlinkStepSize_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleRL_dl_DPCH_InformationModifyList, new_create_dissector_handle(dissect_MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_768_InformationModify_AddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Minimum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_TimeSlotFormat_LCR_ModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_InitDL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeslotISCP_LCR_InfoList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TargetCommunicationControlPortID, new_create_dissector_handle(dissect_CommunicationControlPortID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Fast_Reconfiguration_Permission, new_create_dissector_handle(dissect_Fast_Reconfiguration_Permission_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_PowerBalancing_UpdatedIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_UpdatedIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Information_to_Modify_Unsynchronised, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_Unsynchronised_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_E_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_RL_Information_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_Multiple_RL_Information_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleRL_dl_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeslotISCPInfoList_LCR_DL_PC_RqstTDD, new_create_dissector_handle(dissect_DL_TimeslotISCPInfoLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PrimCCPCH_RSCP_DL_PC_RqstTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PrimaryCCPCH_RSCP_Delta, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_Delta_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NumberOfReportedCellPortions, new_create_dissector_handle(dissect_NumberOfReportedCellPortions_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_AlternativeFormatReportingIndicator, new_create_dissector_handle(dissect_AlternativeFormatReportingIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_Info_DM_Rqst, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_Info_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DPCH_ID768_DM_Rqst, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_Info_DM_Rsp, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_Info_DM_Rsp, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_DedicatedMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_PUSCH_InfoList_DM_Rsp, new_create_dissector_handle(dissect_Multiple_PUSCH_InfoList_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_HSSICHMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DPCH_ID768_DM_Rsp, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_Info_DM_Rprt, new_create_dissector_handle(dissect_PUSCH_Info_DM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_Info_DM_Rprt, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multiple_PUSCH_InfoList_DM_Rprt, new_create_dissector_handle(dissect_Multiple_PUSCH_InfoList_DM_Rprt_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DPCH_ID768_DM_Rprt, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code, new_create_dissector_handle(dissect_DL_ScramblingCode_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_AGCH_FDD_Code_Information, new_create_dissector_handle(dissect_E_AGCH_FDD_Code_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RGCH_E_HICH_FDD_Code_Information, new_create_dissector_handle(dissect_E_RGCH_E_HICH_FDD_Code_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDPA_And_EDCH_CellPortion_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_Target_ReceivedTotalWideBandPower, new_create_dissector_handle(dissect_Maximum_Target_ReceivedTotalWideBandPower_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Target_NonServing_EDCH_To_Total_EDCH_Power_Ratio, new_create_dissector_handle(dissect_Target_NonServing_EDCH_To_Total_EDCH_Power_Ratio_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Common_System_InformationFDD, new_create_dissector_handle(dissect_HSDSCH_Common_System_InformationFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Paging_System_InformationFDD, new_create_dissector_handle(dissect_HSDSCH_Paging_System_InformationFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_PDSCH_TDD_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_PDSCH_TDD_Information_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ConfigurationGenerationID, new_create_dissector_handle(dissect_ConfigurationGenerationID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_PUCH_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_Information_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_HICH_Information_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_Generated_ReceivedTotalWideBandPowerInOtherCells, new_create_dissector_handle(dissect_Maximum_Generated_ReceivedTotalWideBandPowerInOtherCells_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_PUCH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_HICH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_PUCH_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_E_PUCH_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SYNC_UL_Partition_LCR, new_create_dissector_handle(dissect_SYNC_UL_Partition_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PDSCH_AddInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PDSCH_AddInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PDSCH_Timeslot_Format_PSCH_ReconfRqst_LCR, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PDSCH_ModifyInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PDSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_AddInformation_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_AddInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_Timeslot_Format_PSCH_ReconfRqst_LCR, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PUSCH_ModifyInformation_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_PUSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_dL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_hS_SCCH_Information_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_Information_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_hS_SCCH_InformationModify_768_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationModify_768_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_TimeOffset, new_create_dissector_handle(dissect_E_HICH_TimeOffset_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_TimeOffsetLCR, new_create_dissector_handle(dissect_E_HICH_TimeOffsetLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Common_System_Information_ResponseFDD, new_create_dissector_handle(dissect_HSDSCH_Common_System_Information_ResponseFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Paging_System_Information_ResponseFDD, new_create_dissector_handle(dissect_HSDSCH_Paging_System_Information_ResponseFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NSubCyclesPerCyclePeriod_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_NSubCyclesPerCyclePeriod_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SYNCDlCodeIdMeasReconfigurationLCR_CellSyncReconfRqstTDD, new_create_dissector_handle(dissect_SYNCDlCodeIdMeasInfoLCR_CellSyncReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DwPCH_Power, new_create_dissector_handle(dissect_DwPCH_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimingAdjustmentValueLCR, new_create_dissector_handle(dissect_TimingAdjustmentValueLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_AccumulatedClockupdate_CellSyncReprtTDD, new_create_dissector_handle(dissect_TimingAdjustmentValue_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD, new_create_dissector_handle(dissect_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_RearrangeList_Bearer_RearrangeInd, new_create_dissector_handle(dissect_E_DCH_RearrangeList_Bearer_RearrangeInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_FDD_Update_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Update_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPMulticastIndication, new_create_dissector_handle(dissect_IPMulticastIndication_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD, new_create_dissector_handle(dissect_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp, new_create_dissector_handle(dissect_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD, new_create_dissector_handle(dissect_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UARFCN_Adjustment, new_create_dissector_handle(dissect_UARFCN_Adjustment_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd, new_create_dissector_handle(dissect_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UPPCHPositionLCR, new_create_dissector_handle(dissect_UPPCHPositionLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD, new_create_dissector_handle(dissect_UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UPPCH_LCR_InformationList_AuditRsp, new_create_dissector_handle(dissect_UPPCH_LCR_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UPPCH_LCR_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_UPPCH_LCR_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleFreq_dL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleFreq_HS_DSCH_Resources_InformationList_AuditRsp, new_create_dissector_handle(dissect_MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Extended_HS_SCCH_ID, new_create_dissector_handle(dissect_Extended_HS_SCCH_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Extended_HS_SICH_ID, new_create_dissector_handle(dissect_Extended_HS_SICH_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_InfoExt_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_InfoExt_DM_Rqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MBSFN_SpecialTimeSlot_LCR, new_create_dissector_handle(dissect_TimeslotLCR_Extension_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Paging_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Paging_MACFlows_to_DeleteFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_Target_ReceivedTotalWideBandPower_LCR, new_create_dissector_handle(dissect_Maximum_Target_ReceivedTotalWideBandPower_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPDCH_PowerInterpolation, new_create_dissector_handle(dissect_E_DPDCH_PowerInterpolation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_TFCI_Boost_Information, new_create_dissector_handle(dissect_E_TFCI_Boost_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Ext_Max_Bits_MACe_PDU_non_scheduled, new_create_dissector_handle(dissect_Ext_Max_Bits_MACe_PDU_non_scheduled_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Ext_Reference_E_TFCI_PO, new_create_dissector_handle(dissect_Ext_Reference_E_TFCI_PO_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HARQ_MemoryPartitioningInfoExtForMIMO, new_create_dissector_handle(dissect_HARQ_MemoryPartitioningInfoExtForMIMO_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IPMulticastDataBearerIndication, new_create_dissector_handle(dissect_IPMulticastDataBearerIndication_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_MIMO_ActivationIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_MIMO_Mode_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_N_M_Ratio, new_create_dissector_handle(dissect_MIMO_N_M_Ratio_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multicarrier_number, new_create_dissector_handle(dissect_Multicarrier_Number_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_number_Of_Supported_Carriers, new_create_dissector_handle(dissect_Number_Of_Supported_Carriers_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_multipleFreq_HSPDSCH_InformationList_ResponseTDDLCR, new_create_dissector_handle(dissect_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixtyfourQAM_UsageAllowedIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_UsageAllowedIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixtyfourQAM_DL_UsageIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_UsageIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixteenQAM_UL_Operation_Indicator, new_create_dissector_handle(dissect_SixteenQAM_UL_Operation_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TransportBearerNotRequestedIndicator, new_create_dissector_handle(dissect_TransportBearerNotRequestedIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TransportBearerNotSetupIndicator, new_create_dissector_handle(dissect_TransportBearerNotSetupIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_tSN_Length, new_create_dissector_handle(dissect_TSN_Length_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Extended_E_DCH_LCRTDD_PhysicalLayerCategory, new_create_dissector_handle(dissect_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp, new_create_dissector_handle(dissect_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd, new_create_dissector_handle(dissect_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Extended_E_HICH_ID_TDD, new_create_dissector_handle(dissect_Extended_E_HICH_ID_TDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator, new_create_dissector_handle(dissect_ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_MACdPDU_SizeCapability, new_create_dissector_handle(dissect_E_DCH_MACdPDU_SizeCapability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_E_DCH_MACdPDUSizeFormat_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MaximumNumber_Of_Retransmission_for_Scheduling_Info_LCRTDD, new_create_dissector_handle(dissect_Maximum_Number_of_Retransmissions_For_E_DCH_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_RetransmissionTimer_for_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_TimeOffset_Extension, new_create_dissector_handle(dissect_E_HICH_TimeOffset_ExtensionLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_PUCH_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_TBSizeTableIndicator, new_create_dissector_handle(dissect_HSDSCH_TBSizeTableIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_DL_Control_Channel_Change_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Change_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_DL_Control_Channel_Grant_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Grant_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DGANSS_Corrections_Req, new_create_dissector_handle(dissect_DGANSS_Corrections_Req_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_AdditionalTimeSlotListLCR, new_create_dissector_handle(dissect_AdditionalTimeSlotListLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_AdditionalMeasurementValueList, new_create_dissector_handle(dissect_AdditionalMeasurementValueList_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_AGCH_Table_Choice, new_create_dissector_handle(dissect_E_AGCH_Table_Choice_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_Capability, new_create_dissector_handle(dissect_Common_EDCH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_AI_Capability, new_create_dissector_handle(dissect_E_AI_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_System_InformationFDD, new_create_dissector_handle(dissect_Common_EDCH_System_InformationFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_UL_MACFlows_to_DeleteFDD, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_MACdFlows_to_DeleteFDD, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_Delete_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_System_Information_ResponseFDD, new_create_dissector_handle(dissect_Common_EDCH_System_Information_ResponseFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_UE_DRX_Capability, new_create_dissector_handle(dissect_Enhanced_UE_DRX_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_UE_DRX_InformationFDD, new_create_dissector_handle(dissect_Enhanced_UE_DRX_InformationFDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TransportBearerRequestIndicator, new_create_dissector_handle(dissect_TransportBearerRequestIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_SixtyfourQAM_DL_MIMO_Combined_Capability, new_create_dissector_handle(dissect_SixtyfourQAM_DL_MIMO_Combined_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RNTI, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MinimumReducedE_DPDCH_GainFactor, new_create_dissector_handle(dissect_MinimumReducedE_DPDCH_GainFactor_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Time_ID, new_create_dissector_handle(dissect_GANSS_Time_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_AddNavigationModelsReq, new_create_dissector_handle(dissect_GANSS_AddNavigationModelsReq_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_AddUTCModelsReq, new_create_dissector_handle(dissect_GANSS_AddUTCModelsReq_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_AuxInfoReq, new_create_dissector_handle(dissect_GANSS_AuxInfoReq_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_ID, new_create_dissector_handle(dissect_GANSS_ID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DPCCH_Power_Boosting_Capability, new_create_dissector_handle(dissect_E_DPCCH_Power_Boosting_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Common_System_InformationLCR, new_create_dissector_handle(dissect_HSDSCH_Common_System_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Common_System_Information_ResponseLCR, new_create_dissector_handle(dissect_HSDSCH_Common_System_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Paging_System_InformationLCR, new_create_dissector_handle(dissect_HSDSCH_Paging_System_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_Paging_System_Information_ResponseLCR, new_create_dissector_handle(dissect_HSDSCH_Paging_System_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Paging_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Paging_MACFlows_to_DeleteLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_System_InformationLCR, new_create_dissector_handle(dissect_Common_EDCH_System_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_UL_MACFlows_to_DeleteLCR, new_create_dissector_handle(dissect_Common_MACFlows_to_DeleteLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_MACdFlows_to_DeleteLCR, new_create_dissector_handle(dissect_E_DCH_MACdFlows_to_DeleteLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_EDCH_System_Information_ResponseLCR, new_create_dissector_handle(dissect_Common_EDCH_System_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_UE_DRX_CapabilityLCR, new_create_dissector_handle(dissect_Enhanced_UE_DRX_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Enhanced_UE_DRX_InformationLCR, new_create_dissector_handle(dissect_Enhanced_UE_DRX_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_PreconfigurationSetup, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationSetup_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSDSCH_PreconfigurationInfo, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationInfo_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NoOfTargetCellHS_SCCH_Order, new_create_dissector_handle(dissect_NoOfTargetCellHS_SCCH_Order_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_EnhancedHSServingCC_Abort, new_create_dissector_handle(dissect_EnhancedHSServingCC_Abort_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_RL_Setup, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Setup_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_Response_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_RL_Addition, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Addition_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Change_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Change_Information_Response_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Req_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_HS_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Param_Upd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Multi_Cell_Capability_Info, new_create_dissector_handle(dissect_Multi_Cell_Capability_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IMB_Parameters, new_create_dissector_handle(dissect_IMB_Parameters_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MACes_Maximum_Bitrate_LCR, new_create_dissector_handle(dissect_MACes_Maximum_Bitrate_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Semi_PersistentScheduling_CapabilityLCR, new_create_dissector_handle(dissect_Semi_PersistentScheduling_CapabilityLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivity_DRX_CapabilityLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_CapabilityLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivity_DRX_InformationLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_ContinuousPacketConnectivity_DRX_Information_ResponseLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CPC_InformationLCR, new_create_dissector_handle(dissect_CPC_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_AGCH_UE_Inactivity_Monitor_Threshold, new_create_dissector_handle(dissect_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_IdleIntervalInformation, new_create_dissector_handle(dissect_IdleIntervalInformation_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_ReferenceSignal_InformationLCR, new_create_dissector_handle(dissect_HSSICH_ReferenceSignal_InformationLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_ReferenceSignal_InformationListLCR, new_create_dissector_handle(dissect_MIMO_ReferenceSignal_InformationListLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_SFMode_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_SFMode_Supported_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UE_Selected_MBMS_Service_Information, new_create_dissector_handle(dissect_UE_Selected_MBMS_Service_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MultiCarrier_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_LCRTDD_HSDSCH_Physical_Layer_Category_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_E_DCH_HSDPCCH_Capability, new_create_dissector_handle(dissect_Common_E_DCH_HSDPCCH_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DL_RLC_PDU_Size_Format, new_create_dissector_handle(dissect_DL_RLC_PDU_Size_Format_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSICH_ReferenceSignal_InformationModifyLCR, new_create_dissector_handle(dissect_HSSICH_ReferenceSignal_InformationModifyLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_schedulingPriorityIndicator, new_create_dissector_handle(dissect_SchedulingPriorityIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TimeSlotMeasurementValueListLCR, new_create_dissector_handle(dissect_TimeSlotMeasurementValueListLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UE_SupportIndicatorExtension, new_create_dissector_handle(dissect_UE_SupportIndicatorExtension_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Single_Stream_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_ActivationIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Single_Stream_MIMO_Capability, new_create_dissector_handle(dissect_Single_Stream_MIMO_Capability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Single_Stream_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_Mode_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Dual_Band_Capability_Info, new_create_dissector_handle(dissect_Dual_Band_Capability_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UE_AggregateMaximumBitRate_Enforcement_Indicator, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_Power_Offset_For_S_CPICH_Capability, new_create_dissector_handle(dissect_MIMO_PowerOffsetForS_CPICHCapability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MIMO_PilotConfigurationExtension, new_create_dissector_handle(dissect_MIMO_PilotConfigurationExtension_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TxDiversityOnDLControlChannelsByMIMOUECapability, new_create_dissector_handle(dissect_TxDiversityOnDLControlChannelsByMIMOUECapability_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NumberOfReportedCellPortionsLCR, new_create_dissector_handle(dissect_NumberOfReportedCellPortionsLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_CellPortion_CapabilityLCR, new_create_dissector_handle(dissect_CellPortion_CapabilityLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Setup_Req, new_create_dissector_handle(dissect_Additional_EDCH_Setup_Info_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Add_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Add_Req_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_Response_RL_Add, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RL_Add_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_Bearer_Rearrangement, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Bearer_Rearrangement_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Param_Upd_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Preconfiguration_Information, new_create_dissector_handle(dissect_Additional_EDCH_Preconfiguration_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_EDCH_Indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_SPS_Reservation_Indicator, new_create_dissector_handle(dissect_SPS_Reservation_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_DCH_SPS_Reservation_Indicator, new_create_dissector_handle(dissect_SPS_Reservation_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MultipleFreq_HARQ_MemoryPartitioning_InformationList, new_create_dissector_handle(dissect_MultipleFreq_HARQ_MemoryPartitioning_InformationList_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext, new_create_dissector_handle(dissect_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_RepetitionPeriodIndex, new_create_dissector_handle(dissect_RepetitionPeriodIndex_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MidambleShiftLCR, new_create_dissector_handle(dissect_MidambleShiftLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_MaxHSDSCH_HSSCCH_Power_per_CELLPORTION, new_create_dissector_handle(dissect_MaxHSDSCH_HSSCCH_Power_per_CELLPORTION_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DormantModeIndicator, new_create_dissector_handle(dissect_DormantModeIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DiversityMode, new_create_dissector_handle(dissect_DiversityMode_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TransmitDiversityIndicator, new_create_dissector_handle(dissect_TransmitDiversityIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_NonCellSpecificTxDiversity, new_create_dissector_handle(dissect_NonCellSpecificTxDiversity_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Cell_Capability_Container, new_create_dissector_handle(dissect_Cell_Capability_Container_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RNTI_List_Request, new_create_dissector_handle(dissect_NULL_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_RNTI_List, new_create_dissector_handle(dissect_E_RNTI_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PowerControlGAP_For_CellFACHLCR, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UL_Synchronisation_Parameters_For_FACHLCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HS_DSCH_SPS_Operation_Indicator, new_create_dissector_handle(dissect_HS_DSCH_SPS_Operation_Indicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Out_of_Sychronization_Window, new_create_dissector_handle(dissect_Out_of_Sychronization_Window_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst, new_create_dissector_handle(dissect_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_E_HICH_TimeOffset_ReconfFailureTDD, new_create_dissector_handle(dissect_E_HICH_TimeOffset_ReconfFailureTDD_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_HSSCCH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_TS0_CapabilityLCR, new_create_dissector_handle(dissect_TS0_CapabilityLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_UE_TS0_CapabilityLCR, new_create_dissector_handle(dissect_UE_TS0_CapabilityLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Common_System_Information_ResponseLCR, new_create_dissector_handle(dissect_Common_System_Information_ResponseLCR_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Additional_EDCH_Cell_Information_ResponseRLReconf, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLReconf_List_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Multicell_EDCH_InformationItemIEs, new_create_dissector_handle(dissect_Multicell_EDCH_InformationItemIEs_PDU, proto_nbap));
+  dissector_add_uint("nbap.ies", id_Multicell_EDCH_RL_Specific_InformationItemIEs, new_create_dissector_handle(dissect_Multicell_EDCH_RL_Specific_InformationItemIEs_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Modify_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext, new_create_dissector_handle(dissect_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Initial_DL_Transmission_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Maximum_DL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_Minimum_DL_Power, new_create_dissector_handle(dissect_DL_Power_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DCH_MeasurementOccasion_Information, new_create_dissector_handle(dissect_DCH_MeasurementOccasion_Information_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_AssociatedPhsicalChannelID, new_create_dissector_handle(dissect_CommonPhysicalChannelID_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PhysicalChannelID_for_CommonERNTI_RequestedIndicator, new_create_dissector_handle(dissect_PhysicalChannelID_for_CommonERNTI_RequestedIndicator_PDU, proto_nbap));
+  dissector_add_uint("nbap.extension", id_PrecodingWeightSetRestriction, new_create_dissector_handle(dissect_PrecodingWeightSetRestriction_PDU, proto_nbap));
   dissector_add_string("nbap.proc.imsg", "id-cellSetup/fdd", new_create_dissector_handle(dissect_CellSetupRequestFDD_PDU, proto_nbap));
   dissector_add_string("nbap.proc.sout", "id-cellSetup/fdd", new_create_dissector_handle(dissect_CellSetupResponse_PDU, proto_nbap));
   dissector_add_string("nbap.proc.uout", "id-cellSetup/fdd", new_create_dissector_handle(dissect_CellSetupFailure_PDU, proto_nbap));
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index defa9a27c7..b291d0f593 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -532,7 +532,7 @@ proto_reg_handoff_nbipx(void)
 	dissector_handle_t nbipx_handle;
 
 	nbipx_handle = create_dissector_handle(dissect_nbipx, proto_nbipx);
-	dissector_add("ipx.socket", IPX_SOCKET_NETBIOS, nbipx_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NETBIOS, nbipx_handle);
 }
 
 /*
@@ -790,8 +790,8 @@ proto_reg_handoff_nmpi(void)
 	dissector_handle_t nmpi_handle;
 
 	nmpi_handle = create_dissector_handle(dissect_nmpi, proto_nmpi);
-	dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_NAMEQUERY,
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_NAMEQUERY,
 	    nmpi_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_MAILSLOT,
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_MAILSLOT,
 	    nmpi_handle);
 }
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index db84efed65..c54bcca67c 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -1645,7 +1645,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	msg_type = tvb_get_guint8(tvb, offset);
 
-	if (pinfo->match_port == TCP_PORT_CIFS) {
+	if (pinfo->match_uint == TCP_PORT_CIFS) {
 		/*
 		 * Windows 2000 CIFS clients can dispense completely
 		 * with the NETBIOS encapsulation and directly use CIFS
@@ -1985,10 +1985,10 @@ proto_reg_handoff_nbt(void)
   dissector_handle_t nbns_handle, nbdgm_handle, nbss_handle;
 
   nbns_handle = create_dissector_handle(dissect_nbns, proto_nbns);
-  dissector_add("udp.port", UDP_PORT_NBNS, nbns_handle);
+  dissector_add_uint("udp.port", UDP_PORT_NBNS, nbns_handle);
   nbdgm_handle = create_dissector_handle(dissect_nbdgm, proto_nbdgm);
-  dissector_add("udp.port", UDP_PORT_NBDGM, nbdgm_handle);
+  dissector_add_uint("udp.port", UDP_PORT_NBDGM, nbdgm_handle);
   nbss_handle = create_dissector_handle(dissect_nbss, proto_nbss);
-  dissector_add("tcp.port", TCP_PORT_NBSS, nbss_handle);
-  dissector_add("tcp.port", TCP_PORT_CIFS, nbss_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_NBSS, nbss_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_CIFS, nbss_handle);
 }
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index c85fd927c7..aa066c2ee4 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -1115,10 +1115,10 @@ proto_reg_handoff_ncp(void)
 
     ncp_handle = create_dissector_handle(dissect_ncp, proto_ncp);
     ncp_tcp_handle = create_dissector_handle(dissect_ncp_tcp, proto_ncp);
-    dissector_add("tcp.port", TCP_PORT_NCP, ncp_tcp_handle);
-    dissector_add("udp.port", UDP_PORT_NCP, ncp_handle);
-    dissector_add("ipx.packet_type", IPX_PACKET_TYPE_NCP, ncp_handle);
-    dissector_add("ipx.socket", IPX_SOCKET_NCP, ncp_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_NCP, ncp_tcp_handle);
+    dissector_add_uint("udp.port", UDP_PORT_NCP, ncp_handle);
+    dissector_add_uint("ipx.packet_type", IPX_PACKET_TYPE_NCP, ncp_handle);
+    dissector_add_uint("ipx.socket", IPX_SOCKET_NCP, ncp_handle);
 
     data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index a5db2f8b0c..c57af89f3b 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -90,5 +90,5 @@ proto_reg_handoff_ncs(void)
   dissector_handle_t ncs_handle;
 
   ncs_handle = create_dissector_handle(dissect_ncs, proto_ncs);
-  dissector_add("ip.proto", IP_PROTO_NCS_HEARTBEAT, ncs_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_NCS_HEARTBEAT, ncs_handle);
 }
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 09991d5fab..bbb02e4bd9 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -4330,7 +4330,7 @@ proto_reg_handoff_ndmp(void)
 {
   ndmp_handle = new_create_dissector_handle(dissect_ndmp, proto_ndmp);
 #if 0 /* tcpencap needs to own this TCP port; See packet-ipsec-tcp.c */
-  dissector_add("tcp.port",TCP_PORT_NDMP, ndmp_handle);
+  dissector_add_uint("tcp.port",TCP_PORT_NDMP, ndmp_handle);
 #endif
   heur_dissector_add("tcp", dissect_ndmp_heur, proto_ndmp);
 }
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c
index b444ff4bfb..ca39246f75 100644
--- a/epan/dissectors/packet-ndp.c
+++ b/epan/dissectors/packet-ndp.c
@@ -383,9 +383,9 @@ proto_reg_handoff_ndp(void)
 
 	ndp_handle = find_dissector("ndp");
 
-	dissector_add("llc.nortel_pid", 0x01a1, ndp_handle); /* flatnet hello */
-	dissector_add("llc.nortel_pid", 0x01a2, ndp_handle); /* Segment hello */ 
+	dissector_add_uint("llc.nortel_pid", 0x01a1, ndp_handle); /* flatnet hello */
+	dissector_add_uint("llc.nortel_pid", 0x01a2, ndp_handle); /* Segment hello */ 
 	/* not got round to adding this but its really old, so I'm not sure people will see it */
 	/* it uses a different packet format */
-	/*      dissector_add("llc.nortel_pid", 0x01a3, ndp_handle); */ /* Bridge hello */
+	/*      dissector_add_uint("llc.nortel_pid", 0x01a3, ndp_handle); */ /* Bridge hello */
 }
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index d4ccd6c23f..199526e1fe 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -9775,17 +9775,17 @@ proto_reg_handoff_ndps(void)
 	ndps_handle = create_dissector_handle(dissect_ndps_ipx, proto_ndps);
 	ndps_tcp_handle = create_dissector_handle(dissect_ndps_tcp, proto_ndps);
 
-	dissector_add("spx.socket", SPX_SOCKET_PA, ndps_handle);
-	dissector_add("spx.socket", SPX_SOCKET_BROKER, ndps_handle);
-	dissector_add("spx.socket", SPX_SOCKET_SRS, ndps_handle);
-	dissector_add("spx.socket", SPX_SOCKET_ENS, ndps_handle);
-	dissector_add("spx.socket", SPX_SOCKET_RMS, ndps_handle);
-	dissector_add("spx.socket", SPX_SOCKET_NOTIFY_LISTENER, ndps_handle);
-	dissector_add("tcp.port", TCP_PORT_PA, ndps_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_BROKER, ndps_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_SRS, ndps_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_ENS, ndps_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_RMS, ndps_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_NOTIFY_LISTENER, ndps_tcp_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_PA, ndps_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_BROKER, ndps_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_SRS, ndps_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_ENS, ndps_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_RMS, ndps_handle);
+	dissector_add_uint("spx.socket", SPX_SOCKET_NOTIFY_LISTENER, ndps_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_PA, ndps_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_BROKER, ndps_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SRS, ndps_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_ENS, ndps_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_RMS, ndps_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_NOTIFY_LISTENER, ndps_tcp_handle);
 	ndps_data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 4adfc1164a..c793990785 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -1426,6 +1426,6 @@ proto_reg_handoff_netbios(void)
 
 	netbios_handle = create_dissector_handle(dissect_netbios,
 	    proto_netbios);
-	dissector_add("llc.dsap", SAP_NETBIOS, netbios_handle);
+	dissector_add_uint("llc.dsap", SAP_NETBIOS, netbios_handle);
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index 51816d599b..4a5828699b 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -222,12 +222,12 @@ void proto_reg_handoff_netdump(void)
 		initalized = TRUE;
 	} else {
 		if (CurrentPort != 0)
-			dissector_delete("udp.port", CurrentPort, netdump_handle);
+			dissector_delete_uint("udp.port", CurrentPort, netdump_handle);
 	}
 
 	CurrentPort = gPORT_PREF;
 
 	if (CurrentPort != 0)
-		dissector_add("udp.port", CurrentPort, netdump_handle);
+		dissector_add_uint("udp.port", CurrentPort, netdump_handle);
 }
 
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 141d3a2e63..3c461c1075 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -7625,7 +7625,7 @@ static void
 netflow_delete_callback(guint32 port)
 {
 	if ( port ) {
-		dissector_delete("udp.port", port, netflow_handle);
+		dissector_delete_uint("udp.port", port, netflow_handle);
 	}
 }
 
@@ -7633,7 +7633,7 @@ static void
 netflow_add_callback(guint32 port)
 {
 	if ( port ) {
-		dissector_add("udp.port", port, netflow_handle);
+		dissector_add_uint("udp.port", port, netflow_handle);
 	}
 }
 
@@ -7641,9 +7641,9 @@ static void
 ipfix_delete_callback(guint32 port)
 {
 	if ( port ) {
-		dissector_delete("udp.port", port, netflow_handle);
-		dissector_delete("tcp.port", port, netflow_handle);
-		dissector_delete("sctp.port", port, netflow_handle);
+		dissector_delete_uint("udp.port", port, netflow_handle);
+		dissector_delete_uint("tcp.port", port, netflow_handle);
+		dissector_delete_uint("sctp.port", port, netflow_handle);
 	}
 }
 
@@ -7651,9 +7651,9 @@ static void
 ipfix_add_callback(guint32 port)
 {
 	if ( port ) {
-		dissector_add("udp.port", port, netflow_handle);
-		dissector_add("tcp.port", port, netflow_handle);
-		dissector_add("sctp.port", port, netflow_handle);
+		dissector_add_uint("udp.port", port, netflow_handle);
+		dissector_add_uint("tcp.port", port, netflow_handle);
+		dissector_add_uint("sctp.port", port, netflow_handle);
 	}
 }
 
@@ -7667,7 +7667,7 @@ proto_reg_handoff_netflow(void)
 	if (!netflow_prefs_initialized) {
 		netflow_handle = new_create_dissector_handle(dissect_netflow, proto_netflow);
 		netflow_prefs_initialized = TRUE;
-		dissector_add("wtap_encap", WTAP_ENCAP_RAW_IPFIX, netflow_handle);
+		dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IPFIX, netflow_handle);
 	} else {
 		range_foreach(netflow_ports, netflow_delete_callback);
 		g_free(netflow_ports);
diff --git a/epan/dissectors/packet-netmon-802_11.c b/epan/dissectors/packet-netmon-802_11.c
index ceac80a2ab..bf40612383 100644
--- a/epan/dissectors/packet-netmon-802_11.c
+++ b/epan/dissectors/packet-netmon-802_11.c
@@ -235,5 +235,5 @@ proto_reg_handoff_netmon_802_11(void)
   ieee80211_handle = find_dissector("wlan");
   netmon_802_11_handle = create_dissector_handle(dissect_netmon_802_11,
                                                  proto_netmon_802_11);
-  dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_11_NETMON_RADIO, netmon_802_11_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_11_NETMON_RADIO, netmon_802_11_handle);
 }
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c
index 42125c3b4f..4db2a14d88 100644
--- a/epan/dissectors/packet-netperfmeter.c
+++ b/epan/dissectors/packet-netperfmeter.c
@@ -437,6 +437,6 @@ proto_reg_handoff_npmp(void)
   dissector_handle_t npmp_handle;
 
   npmp_handle = new_create_dissector_handle(dissect_npmp, proto_npmp);
-  dissector_add("sctp.ppi", PPID_NETPERFMETER_CONTROL, npmp_handle);
-  dissector_add("sctp.ppi", PPID_NETPERFMETER_DATA,    npmp_handle);
+  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_CONTROL, npmp_handle);
+  dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_DATA,    npmp_handle);
 }
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 4b744ee914..05ebec4425 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -778,10 +778,10 @@ proto_reg_handoff_netsync(void)
 		netsync_handle = create_dissector_handle(dissect_netsync, proto_netsync);
 		initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", tcp_port_netsync, netsync_handle);
+		dissector_delete_uint("tcp.port", tcp_port_netsync, netsync_handle);
 	}
 
 	tcp_port_netsync = global_tcp_port_netsync;
-	dissector_add("tcp.port", global_tcp_port_netsync, netsync_handle);
+	dissector_add_uint("tcp.port", global_tcp_port_netsync, netsync_handle);
 }
 
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index ada9161cb9..0f1f3c9721 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -240,7 +240,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             call_dissector(tr_handle, tvb, pinfo, tree);
             break;
          case WTAP_ENCAP_NETTL_FDDI:
-            if (!dissector_try_port(wtap_dissector_table,
+            if (!dissector_try_uint(wtap_dissector_table,
 			WTAP_ENCAP_FDDI_BITSWAPPED, tvb, pinfo, tree))
 	            call_dissector(data_handle, tvb, pinfo, tree);
             break;
@@ -250,17 +250,17 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	            call_dissector(data_handle, tvb, pinfo, tree);
             else if (pinfo->pseudo_header->nettl.subsys == NETTL_SUBSYS_NS_LS_SCTP )
                     call_dissector(sctp_handle, tvb, pinfo, tree);
-            else if (!dissector_try_port(wtap_dissector_table,
+            else if (!dissector_try_uint(wtap_dissector_table,
 			WTAP_ENCAP_RAW_IP, tvb, pinfo, tree))
 	            call_dissector(data_handle, tvb, pinfo, tree);
             break;
          case WTAP_ENCAP_NETTL_RAW_ICMP:
-            if (!dissector_try_port(ip_proto_dissector_table,
+            if (!dissector_try_uint(ip_proto_dissector_table,
 			IP_PROTO_ICMP, tvb, pinfo, tree))
 	            call_dissector(data_handle, tvb, pinfo, tree);
             break;
          case WTAP_ENCAP_NETTL_RAW_ICMPV6:
-            if (!dissector_try_port(ip_proto_dissector_table,
+            if (!dissector_try_uint(ip_proto_dissector_table,
 	                IP_PROTO_ICMPV6, tvb, pinfo, tree))
 	            call_dissector(data_handle, tvb, pinfo, tree);
             break;
@@ -275,7 +275,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             	call_dissector(x25_handle, tvb, pinfo, tree);
             break;
          case WTAP_ENCAP_NETTL_RAW_TELNET:
-            if (!dissector_try_port(tcp_subdissector_table,
+            if (!dissector_try_uint(tcp_subdissector_table,
 	                TCP_PORT_TELNET, tvb, pinfo, tree))
 	            call_dissector(data_handle, tvb, pinfo, tree);
             break;
@@ -359,14 +359,14 @@ proto_reg_handoff_nettl(void)
   tcp_subdissector_table = find_dissector_table("tcp.port");
 
   nettl_handle = create_dissector_handle(dissect_nettl, proto_nettl);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_ETHERNET, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_TOKEN_RING, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_FDDI, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_RAW_IP, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_RAW_ICMP, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_RAW_ICMPV6, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_RAW_TELNET, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_X25, nettl_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_NETTL_UNKNOWN, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_ETHERNET, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_TOKEN_RING, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_FDDI, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_RAW_IP, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_RAW_ICMP, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_RAW_ICMPV6, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_RAW_TELNET, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_X25, nettl_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_UNKNOWN, nettl_handle);
 
 }
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index b5f794825a..5c352f4377 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -133,12 +133,12 @@ proto_reg_handoff_newmail(void)
 		inited = TRUE;
 	} else {
                 if (preference_default_port_last != 0) {
-                        dissector_delete("udp.port", preference_default_port_last, newmail_handle);
+                        dissector_delete_uint("udp.port", preference_default_port_last, newmail_handle);
                 }
         }	
 
 	if(preference_default_port != 0) {	
-		dissector_add("udp.port", preference_default_port, newmail_handle);
+		dissector_add_uint("udp.port", preference_default_port, newmail_handle);
 	}
         preference_default_port_last = preference_default_port;
 }
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 69377d3c11..4f14b6bef2 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -2376,7 +2376,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
 			real_length=tvb_length_remaining(tvb, offset);
 		}
 		fh_tvb=tvb_new_subset(tvb, offset, real_length, fhlen);
-		if(!dissector_try_port(nfs_fhandle_table, default_nfs_fhandle_type, fh_tvb, pinfo, tree)){
+		if(!dissector_try_uint(nfs_fhandle_table, default_nfs_fhandle_type, fh_tvb, pinfo, tree)){
 			dissect_fhandle_data_unknown(fh_tvb, pinfo, tree);
 		}
 	}
@@ -12396,29 +12396,29 @@ proto_reg_handoff_nfs(void)
 	rpc_init_proc_table(NFS_PROGRAM, 4, nfs4_proc, hf_nfs_procedure_v4);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_SVR4, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_SVR4, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_SVR4, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_LE, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_LINUX_KNFSD_LE, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_LINUX_KNFSD_LE, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_LINUX_NFSD_LE, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_LINUX_NFSD_LE, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_LINUX_NFSD_LE, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_NEW, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_LINUX_KNFSD_NEW, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_LINUX_KNFSD_NEW, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_NETAPP, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_NETAPP, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_NETAPP, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_NETAPP_V4, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_NETAPP_V4, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_NETAPP_V4, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_NETAPP_GX_v3, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_NETAPP_GX_V3, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_NETAPP_GX_V3, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_CELERRA, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_CELERRA, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_CELERRA, fhandle_handle);
 
 	fhandle_handle=create_dissector_handle(dissect_fhandle_data_unknown, proto_nfs);
-	dissector_add("nfs_fhandle.type", FHT_UNKNOWN, fhandle_handle);
+	dissector_add_uint("nfs_fhandle.type", FHT_UNKNOWN, fhandle_handle);
 }
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 7604d6d96b..15a6fabbd2 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -751,7 +751,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb,
 						 * the protocol type should
 						 * be the Ethertype, but....
 						 */
-						dissected = dissector_try_port(
+						dissected = dissector_try_uint(
 						    ethertype_subdissector_table,
 						    hdr->ar_pro_type_pid,
 						    sub_tvb, pinfo, ind_tree);
@@ -762,7 +762,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb,
 						 * just dissect as data.
 						 */
 						if (oui_info != NULL) {
-							dissected = dissector_try_port(
+							dissected = dissector_try_uint(
 							    oui_info->table,
 							    hdr->ar_pro_type_pid,
 							    sub_tvb, pinfo,
@@ -774,11 +774,11 @@ void dissect_nhrp_mand(tvbuff_t *tvb,
 					/*
 					 * Dissect based on the NLPID.
 					 */
-					dissected = dissector_try_port(
+					dissected = dissector_try_uint(
 					    osinl_subdissector_table,
 					    hdr->ar_pro_type, sub_tvb, pinfo,
 					    ind_tree) ||
-					            dissector_try_port(
+					            dissector_try_uint(
 					    osinl_excl_subdissector_table,
 					    hdr->ar_pro_type, sub_tvb, pinfo,
 					    ind_tree);
@@ -793,7 +793,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb,
 				/* Experimental/Local use */
 				dissected = FALSE;
 			} else {
-				dissected = dissector_try_port(
+				dissected = dissector_try_uint(
 				    ethertype_subdissector_table,
 				    hdr->ar_pro_type, sub_tvb, pinfo, ind_tree);
 			}
@@ -1201,7 +1201,7 @@ proto_reg_handoff_nhrp(void)
 	ethertype_subdissector_table = find_dissector_table("ethertype");
 
 	nhrp_handle = create_dissector_handle(dissect_nhrp, proto_nhrp);
-	dissector_add("ip.proto", IP_PROTO_NARP, nhrp_handle);
-	dissector_add("gre.proto", GRE_NHRP, nhrp_handle);
-	dissector_add("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_NARP, nhrp_handle);
+	dissector_add_uint("gre.proto", GRE_NHRP, nhrp_handle);
+	dissector_add_uint("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle);
 }
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index 95917300b6..3147a8021c 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -1646,5 +1646,5 @@ proto_reg_handoff_nlsp(void)
 	dissector_handle_t nlsp_handle;
 
 	nlsp_handle = create_dissector_handle(dissect_nlsp, proto_nlsp);
-	dissector_add("ipx.socket", IPX_SOCKET_NLSP, nlsp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NLSP, nlsp_handle);
 }
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index f286496e0a..941d7def41 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -49,7 +49,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	gint		next_offset;
 	int		linelen;
 
-        if (pinfo->match_port == pinfo->destport)
+        if (pinfo->match_uint == pinfo->destport)
         	type = "Request";
         else
         	type = "Response";
@@ -76,7 +76,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		    FALSE);
 		nntp_tree = proto_item_add_subtree(ti, ett_nntp);
 
-		if (pinfo->match_port == pinfo->destport) {
+		if (pinfo->match_uint == pinfo->destport) {
 			ti = proto_tree_add_boolean(nntp_tree,
 			    hf_nntp_request, tvb, 0, 0, TRUE);
 		} else {
@@ -141,5 +141,5 @@ proto_reg_handoff_nntp(void)
 	dissector_handle_t nntp_handle;
 
 	nntp_handle = create_dissector_handle(dissect_nntp, proto_nntp);
-	dissector_add("tcp.port", TCP_PORT_NNTP, nntp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_NNTP, nntp_handle);
 }
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 895b135ea5..12846f6f96 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -1204,13 +1204,13 @@ proto_register_nsip(void)
 static void
 range_delete_callback(guint32 port)
 {
-    dissector_delete("udp.port", port, nsip_handle);
+    dissector_delete_uint("udp.port", port, nsip_handle);
 }
 
 static void
 range_add_callback(guint32 port)
 {
-    dissector_add("udp.port", port, nsip_handle);
+    dissector_add_uint("udp.port", port, nsip_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index 3c40b867e5..e099e095b6 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -511,5 +511,5 @@ proto_reg_handoff_nsrp(void)
     dissector_handle_t nsrp_handle;
 
     nsrp_handle = create_dissector_handle(dissect_nsrp, proto_nsrp);
-    dissector_add("ethertype", ETHERTYPE_NSRP, nsrp_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_NSRP, nsrp_handle);
 }
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index da7ebc1717..f70a0554b5 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -181,6 +181,6 @@ void proto_reg_handoff_ns(void)
 	eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
 	nstrace_handle = create_dissector_handle(dissect_nstrace, proto_nstrace);
-	dissector_add("wtap_encap", WTAP_ENCAP_NSTRACE_1_0, nstrace_handle);
-	dissector_add("wtap_encap", WTAP_ENCAP_NSTRACE_2_0, nstrace_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_1_0, nstrace_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_2_0, nstrace_handle);
 }
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index d3d8be0a28..f3b616e671 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -252,5 +252,5 @@ proto_reg_handoff_tpcp(void)
     dissector_handle_t tpcp_handle;
 	
     tpcp_handle = create_dissector_handle(dissect_tpcp, proto_tpcp);
-    dissector_add("udp.port", UDP_PORT_TPCP, tpcp_handle);
+    dissector_add_uint("udp.port", UDP_PORT_TPCP, tpcp_handle);
 }
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index a471348b42..59ed21abd5 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -1444,6 +1444,6 @@ proto_reg_handoff_ntp(void)
 	dissector_handle_t ntp_handle;
 
 	ntp_handle = create_dissector_handle(dissect_ntp, proto_ntp);
-	dissector_add("udp.port", UDP_PORT_NTP, ntp_handle);
-	dissector_add("tcp.port", TCP_PORT_NTP, ntp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_NTP, ntp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_NTP, ntp_handle);
 }
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index ed4914e361..fc169ab770 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -430,7 +430,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       }
 
       next_tvb = tvb_new_subset_remaining(tvb, 4);
-      if (!dissector_try_port(ethertype_dissector_table,
+      if (!dissector_try_uint(ethertype_dissector_table,
             (guint16) null_header, next_tvb, pinfo, tree))
 	call_dissector(data_handle, next_tvb, pinfo, tree);
     } else {
@@ -443,7 +443,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       }
 
       next_tvb = tvb_new_subset_remaining(tvb, 4);
-      if (!dissector_try_port(null_dissector_table, null_header,
+      if (!dissector_try_uint(null_dissector_table, null_header,
 	    next_tvb, pinfo, tree)) {
         /* No sub-dissector found.  Label rest of packet as "Data" */
         call_dissector(data_handle,next_tvb, pinfo, tree);
@@ -494,5 +494,5 @@ proto_reg_handoff_null(void)
 	ethertype_dissector_table = find_dissector_table("ethertype");
 
 	null_handle = create_dissector_handle(dissect_null, proto_null);
-	dissector_add("wtap_encap", WTAP_ENCAP_NULL, null_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_NULL, null_handle);
 }
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index eea0cdd565..19f6192abb 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -200,6 +200,6 @@ proto_reg_handoff_oicq(void)
 	dissector_handle_t oicq_handle;
 
 	oicq_handle = new_create_dissector_handle(dissect_oicq, proto_oicq);
-	dissector_add("udp.port", UDP_PORT_OICQ, oicq_handle);
+	dissector_add_uint("udp.port", UDP_PORT_OICQ, oicq_handle);
 }
 
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index 93b693d850..9be80a4c81 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -1005,5 +1005,5 @@ void proto_reg_handoff_olsr(void) {
   dissector_handle_t olsr_handle;
 
   olsr_handle = new_create_dissector_handle(dissect_olsr, proto_olsr);
-  dissector_add("udp.port", UDP_PORT_OLSR, olsr_handle);
+  dissector_add_uint("udp.port", UDP_PORT_OLSR, olsr_handle);
 }
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index ec150030a4..5af8ba3f04 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -310,5 +310,5 @@ proto_reg_handoff_omapi(void)
   dissector_handle_t omapi_handle;
 
   omapi_handle = create_dissector_handle(dissect_omapi, proto_omapi);
-  dissector_add("tcp.port", OMAPI_PORT, omapi_handle);
+  dissector_add_uint("tcp.port", OMAPI_PORT, omapi_handle);
 }
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index 2f8cfc39f2..a6f17ec506 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -3987,7 +3987,7 @@ proto_reg_handoff_omron_fins(void)
     dissector_handle_t omron_fins_handle;
 
     omron_fins_handle = new_create_dissector_handle(dissect_omron_fins, proto_omron_fins);
-    dissector_add("udp.port", OMRON_FINS_UDP_PORT, omron_fins_handle);
+    dissector_add_uint("udp.port", OMRON_FINS_UDP_PORT, omron_fins_handle);
 }
 
 
diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c
index ba54276095..d5ab0810af 100644
--- a/epan/dissectors/packet-opsi.c
+++ b/epan/dissectors/packet-opsi.c
@@ -889,5 +889,5 @@ proto_reg_handoff_opsi(void)
 {
 	dissector_handle_t opsi_handle;
 	opsi_handle = create_dissector_handle(dissect_opsi, proto_opsi);
-	dissector_add("tcp.port", TCP_PORT_OPSI, opsi_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_OPSI, opsi_handle);
 }
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 69383c3f6f..10e516dd84 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -250,11 +250,11 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   nlpid = tvb_get_guint8(tvb, 0);
 
   /* try lookup with the subdissector tables that includes the nlpid */
-  if (dissector_try_port(osinl_subdissector_table, nlpid, tvb, pinfo, tree))
+  if (dissector_try_uint(osinl_subdissector_table, nlpid, tvb, pinfo, tree))
     return;
   /* try lookup with the subdissector tables that excludes the nlpid */
   new_tvb = tvb_new_subset_remaining(tvb, 1);
-  if (dissector_try_port(osinl_excl_subdissector_table, nlpid, new_tvb, pinfo, tree))
+  if (dissector_try_uint(osinl_excl_subdissector_table, nlpid, new_tvb, pinfo, tree))
     return;
 
   switch (nlpid) {
@@ -288,15 +288,15 @@ proto_reg_handoff_osi(void)
 
   if (!osi_prefs_initialized) {
     osi_handle = create_dissector_handle(dissect_osi, proto_osi);
-    dissector_add("llc.dsap", SAP_OSINL1, osi_handle);
-    dissector_add("llc.dsap", SAP_OSINL2, osi_handle);
-    dissector_add("llc.dsap", SAP_OSINL3, osi_handle);
-    dissector_add("llc.dsap", SAP_OSINL4, osi_handle);
-    dissector_add("llc.dsap", SAP_OSINL5, osi_handle);
-    dissector_add("ppp.protocol", PPP_OSI, osi_handle);
-    dissector_add("chdlctype", CHDLCTYPE_OSI, osi_handle);
-    dissector_add("null.type", BSD_AF_ISO, osi_handle);
-    dissector_add("gre.proto", SAP_OSINL5, osi_handle);
+    dissector_add_uint("llc.dsap", SAP_OSINL1, osi_handle);
+    dissector_add_uint("llc.dsap", SAP_OSINL2, osi_handle);
+    dissector_add_uint("llc.dsap", SAP_OSINL3, osi_handle);
+    dissector_add_uint("llc.dsap", SAP_OSINL4, osi_handle);
+    dissector_add_uint("llc.dsap", SAP_OSINL5, osi_handle);
+    dissector_add_uint("ppp.protocol", PPP_OSI, osi_handle);
+    dissector_add_uint("chdlctype", CHDLCTYPE_OSI, osi_handle);
+    dissector_add_uint("null.type", BSD_AF_ISO, osi_handle);
+    dissector_add_uint("gre.proto", SAP_OSINL5, osi_handle);
     data_handle = find_dissector("data");
     ppp_handle  = find_dissector("ppp");
 
@@ -305,12 +305,12 @@ proto_reg_handoff_osi(void)
     osi_prefs_initialized = TRUE;
   } else {
     if (tcp_port_osi_over_tpkt != 0) {
-      dissector_delete("tcp.port", tcp_port_osi_over_tpkt, osi_tpkt_handle);
+      dissector_delete_uint("tcp.port", tcp_port_osi_over_tpkt, osi_tpkt_handle);
     }
   }
 
   if (global_tcp_port_osi_over_tpkt != 0) {
-    dissector_add("tcp.port", global_tcp_port_osi_over_tpkt, osi_tpkt_handle);
+    dissector_add_uint("tcp.port", global_tcp_port_osi_over_tpkt, osi_tpkt_handle);
   }
   tcp_port_osi_over_tpkt = global_tcp_port_osi_over_tpkt;
 }
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 70d7319380..2024f23138 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -1890,7 +1890,7 @@ proto_reg_handoff_cotp(void)
   dissector_handle_t ositp_handle;
 
   ositp_handle = find_dissector("ositp");
-  dissector_add("ip.proto", IP_PROTO_TP, ositp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_TP, ositp_handle);
 
   data_handle = find_dissector("data");
 
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index f0d298a514..19873adec4 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -3452,6 +3452,6 @@ proto_reg_handoff_ospf(void)
     dissector_handle_t ospf_handle;
 
     ospf_handle = create_dissector_handle(dissect_ospf, proto_ospf);
-    dissector_add("ip.proto", IP_PROTO_OSPF, ospf_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_OSPF, ospf_handle);
     data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 9fa3c23764..322cb8b9c8 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -5859,12 +5859,12 @@ prefs_register_p7(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_p7_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_p7_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_p7_tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 67a19e4f7a..2466977a85 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1618,12 +1618,12 @@ void proto_register_p_mul (void)
 
 static void range_delete_callback (guint32 port)
 {
-    dissector_delete ("udp.port", port, p_mul_handle);
+    dissector_delete_uint ("udp.port", port, p_mul_handle);
 }
 
 static void range_add_callback (guint32 port)
 {
-    dissector_add ("udp.port", port, p_mul_handle);
+    dissector_add_uint ("udp.port", port, p_mul_handle);
 }
 
 void proto_reg_handoff_p_mul (void)
diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c
index 67a6735f80..0c35441b57 100644
--- a/epan/dissectors/packet-packetbb.c
+++ b/epan/dissectors/packet-packetbb.c
@@ -717,11 +717,11 @@ void proto_reg_handoff_packetbb(void) {
     packetbb_prefs_initialized = TRUE;
   }
   else {
-    dissector_delete("udp.port", global_packetbb_port, packetbb_handle);
+    dissector_delete_uint("udp.port", global_packetbb_port, packetbb_handle);
   }
 
   packetbb_udp_port = global_packetbb_port;
-  dissector_add("udp.port", packetbb_udp_port, packetbb_handle);
+  dissector_add_uint("udp.port", packetbb_udp_port, packetbb_handle);
 }
 
 void proto_register_packetbb(void) {
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 09c883311d..8c5e688ac1 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -116,7 +116,7 @@ static void dissect_packetlogger (tvbuff_t *tvb, packet_info *pinfo, proto_tree
     proto_item_set_len (ti, 1);
 
     col_add_fstr (pinfo->cinfo, COL_INFO, "%s", val_to_str(pl_type, type_vals, "Unknown 0x%02x"));
-    if (!dissector_try_port (hci_h1_table, pinfo->pseudo_header->bthci.channel, next_tvb, pinfo, tree)) {
+    if (!dissector_try_uint (hci_h1_table, pinfo->pseudo_header->bthci.channel, next_tvb, pinfo, tree)) {
       call_dissector (data_handle, next_tvb, pinfo, tree);
     }
   } else {
@@ -163,7 +163,7 @@ void proto_reg_handoff_packetlogger (void)
   packetlogger_handle = find_dissector (PFNAME);
   hci_h1_table = find_dissector_table("hci_h1.type");
   data_handle = find_dissector("data");
-  dissector_add ("wtap_encap", WTAP_ENCAP_PACKETLOGGER, packetlogger_handle);
+  dissector_add_uint ("wtap_encap", WTAP_ENCAP_PACKETLOGGER, packetlogger_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index b7a90b3064..07e5307e6d 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -572,5 +572,5 @@ proto_reg_handoff_pagp(void)
   dissector_handle_t pagp_handle;
 
   pagp_handle = create_dissector_handle(dissect_pagp, proto_pagp);
-  dissector_add("llc.cisco_pid", 0x0104, pagp_handle);
+  dissector_add_uint("llc.cisco_pid", 0x0104, pagp_handle);
 }
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 4c308b2d6b..b09fe6473b 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -13176,32 +13176,32 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -13224,14 +13224,14 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn ) {
-        dissector_delete("sccp.ssn", ssn, pcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn) {
-        dissector_add("sccp.ssn", ssn, pcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
@@ -13249,125 +13249,125 @@ proto_reg_handoff_pcap(void)
 
 /*--- Included file: packet-pcap-dis-tab.c ---*/
 #line 1 "packet-pcap-dis-tab.c"
-  dissector_add("pcap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GPS_UTRAN_TRU, new_create_dissector_handle(dissect_GPS_UTRAN_TRU_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GPS_MeasuredResultsList, new_create_dissector_handle(dissect_MeasuredResultsList_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UE_PositionEstimate, new_create_dissector_handle(dissect_UE_PositionEstimate_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_CellId_MeasuredResultsSets, new_create_dissector_handle(dissect_CellId_MeasuredResultsSets_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_OTDOA_MeasurementGroup, new_create_dissector_handle(dissect_OTDOA_MeasurementGroup_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_AccuracyFulfilmentIndicator, new_create_dissector_handle(dissect_AccuracyFulfilmentIndicator_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_HorizontalAccuracyCode, new_create_dissector_handle(dissect_HorizontalAccuracyCode_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_VerticalAccuracyCode, new_create_dissector_handle(dissect_VerticalAccuracyCode_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UTDOA_Group, new_create_dissector_handle(dissect_UTDOA_Group_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UE_PositioningCapability, new_create_dissector_handle(dissect_UE_PositioningCapability_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UC_id, new_create_dissector_handle(dissect_UC_ID_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_ResponseTime, new_create_dissector_handle(dissect_ResponseTime_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PositioningPriority, new_create_dissector_handle(dissect_PositioningPriority_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_ClientType, new_create_dissector_handle(dissect_ClientType_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PositioningMethod, new_create_dissector_handle(dissect_PositioningMethod_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UTDOAPositioning, new_create_dissector_handle(dissect_UTDOAPositioning_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GPSPositioning, new_create_dissector_handle(dissect_GPSPositioning_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_OTDOAAssistanceData, new_create_dissector_handle(dissect_OTDOAAssistanceData_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_Positioning_ResponseTime, new_create_dissector_handle(dissect_Positioning_ResponseTime_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_EnvironmentCharacterisation, new_create_dissector_handle(dissect_EnvironmentCharacterisation_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PositionData, new_create_dissector_handle(dissect_PositionData_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_VelocityEstimate, new_create_dissector_handle(dissect_VelocityEstimate_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UC_ID_InfEx_Rqst, new_create_dissector_handle(dissect_UC_ID_InfEx_Rqst_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UE_PositionEstimateInfo, new_create_dissector_handle(dissect_UE_PositionEstimateInfo_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_OTDOA_MeasuredResultsSets, new_create_dissector_handle(dissect_OTDOA_MeasuredResultsSets_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PeriodicPosCalcInfo, new_create_dissector_handle(dissect_PeriodicPosCalcInfo_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_MeasInstructionsUsed, new_create_dissector_handle(dissect_MeasInstructionsUsed_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_PeriodicTerminationCause, new_create_dissector_handle(dissect_PeriodicTerminationCause_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_IncludeVelocity, new_create_dissector_handle(dissect_IncludeVelocity_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_AmountOfReporting, new_create_dissector_handle(dissect_AmountOfReporting_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_CellIDPositioning, new_create_dissector_handle(dissect_CellIDPositioning_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSSPositioning, new_create_dissector_handle(dissect_GANSSPositioning_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_RRCstateChange, new_create_dissector_handle(dissect_RRCstateChange_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_MeasuredResultsList, new_create_dissector_handle(dissect_GANSS_MeasuredResultsList_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_UTRAN_TRU, new_create_dissector_handle(dissect_GANSS_UTRAN_TRU_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_AdditionalGPSAssistDataRequired, new_create_dissector_handle(dissect_AdditionalGPSAssistDataRequired_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_AdditionalGanssAssistDataRequired, new_create_dissector_handle(dissect_AdditionalGanssAssistDataRequired_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_rxTimingDeviation768Info, new_create_dissector_handle(dissect_RxTimingDeviation768Info_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_rxTimingDeviation384extInfo, new_create_dissector_handle(dissect_RxTimingDeviation384extInfo_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_roundTripTimeInfoWithType1, new_create_dissector_handle(dissect_RoundTripTimeInfoWithType1_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_AddMeasurementInfo, new_create_dissector_handle(dissect_AddMeasurementInfo_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_angleOfArrivalLCR, new_create_dissector_handle(dissect_AngleOfArrivalLCR_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_extendedTimingAdvanceLCR, new_create_dissector_handle(dissect_ExtendedTimingAdvanceLCR_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_PositioningDataSet, new_create_dissector_handle(dissect_GANSS_PositioningDataSet_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_CommonAssistanceData, new_create_dissector_handle(dissect_GANSS_CommonAssistanceData_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_GenericAssistanceDataList, new_create_dissector_handle(dissect_GANSS_GenericAssistanceDataList_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GPS_ReferenceLocation, new_create_dissector_handle(dissect_GPS_ReferenceLocation_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_UTRAN_GPS_DriftRate, new_create_dissector_handle(dissect_UTRAN_GPS_DriftRate_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GPSReferenceTimeUncertainty, new_create_dissector_handle(dissect_GPSReferenceTimeUncertainty_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_OTDOA_AddMeasuredResultsInfo, new_create_dissector_handle(dissect_OTDOA_AddMeasuredResultsInfo_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_additionalMeasurementInforLCR, new_create_dissector_handle(dissect_AdditionalMeasurementInforLCR_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GNSS_PositioningMethod, new_create_dissector_handle(dissect_GNSS_PositioningMethod_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_NetworkAssistedGANSSSuport, new_create_dissector_handle(dissect_NetworkAssistedGANSSSupport_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_UTRAN_GPSReferenceTime, new_create_dissector_handle(dissect_UTRAN_GPSReferenceTime_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_SBAS_IDs, new_create_dissector_handle(dissect_GANSS_SBAS_IDs_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_Signal_IDs, new_create_dissector_handle(dissect_GANSS_Signal_IDs_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_NAVKeplerianSet_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ReducedKeplerianSet_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_MidiAlmanacSet_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_ALM_GlonassAlmanacSet_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ECEFsbasAlmanacSet_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_UTRAN_GANSSReferenceTimeResult, new_create_dissector_handle(dissect_UTRAN_GANSSReferenceTimeResult_PDU, proto_pcap));
-  dissector_add("pcap.ies", id_GANSS_Reference_Time_Only, new_create_dissector_handle(dissect_GANSS_Reference_Time_Only_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSS_AddADchoices, new_create_dissector_handle(dissect_GANSS_AddADchoices_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_supportGANSSNonNativeADchoices, new_create_dissector_handle(dissect_SupportGANSSNonNativeADchoices_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_PositionDataUEbased, new_create_dissector_handle(dissect_PositionDataUEbased_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssCodePhaseAmbiguityExt, new_create_dissector_handle(dissect_GanssCodePhaseAmbiguityExt_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssIntegerCodePhaseExt, new_create_dissector_handle(dissect_GanssIntegerCodePhaseExt_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSScarrierPhaseRequested, new_create_dissector_handle(dissect_GANSScarrierPhaseRequested_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_GANSSMultiFreqMeasRequested, new_create_dissector_handle(dissect_GANSSMultiFreqMeasRequested_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssReq_AddIonosphericModel, new_create_dissector_handle(dissect_GANSSReq_AddIonosphericModel_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssReq_EarthOrientPara, new_create_dissector_handle(dissect_GANSSReq_EarthOrientPara_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssAddNavigationModel_req, new_create_dissector_handle(dissect_GANSS_AddNavigationModel_Req_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssAddUTCModel_req, new_create_dissector_handle(dissect_GANSS_AddUTCModel_Req_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_ganssAuxInfo_req, new_create_dissector_handle(dissect_GANSS_AuxInfo_req_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_OTDOA_ReferenceCellInfo, new_create_dissector_handle(dissect_OTDOA_ReferenceCellInfoSAS_centric_PDU, proto_pcap));
-  dissector_add("pcap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationRequest_PDU, proto_pcap));
-  dissector_add("pcap.proc.sout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationResponse_PDU, proto_pcap));
-  dissector_add("pcap.proc.uout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationFailure_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationRequest_PDU, proto_pcap));
-  dissector_add("pcap.proc.sout", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationResponse_PDU, proto_pcap));
-  dissector_add("pcap.proc.uout", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationFailure_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationRequest_PDU, proto_pcap));
-  dissector_add("pcap.proc.sout", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationResponse_PDU, proto_pcap));
-  dissector_add("pcap.proc.uout", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationFailure_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationRequest_PDU, proto_pcap));
-  dissector_add("pcap.proc.sout", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationResponse_PDU, proto_pcap));
-  dissector_add("pcap.proc.uout", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationFailure_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_InformationReporting, new_create_dissector_handle(dissect_InformationReport_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_InformationExchangeTermination, new_create_dissector_handle(dissect_InformationExchangeTerminationRequest_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_InformationExchangeFailure, new_create_dissector_handle(dissect_InformationExchangeFailureIndication_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionParameterModification, new_create_dissector_handle(dissect_PositionParameterModification_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_Abort, new_create_dissector_handle(dissect_Abort_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionPeriodicReport, new_create_dissector_handle(dissect_PositionPeriodicReport_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionPeriodicResult, new_create_dissector_handle(dissect_PositionPeriodicResult_PDU, proto_pcap));
-  dissector_add("pcap.proc.imsg", id_PositionPeriodicTermination, new_create_dissector_handle(dissect_PositionPeriodicTermination_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GPS_UTRAN_TRU, new_create_dissector_handle(dissect_GPS_UTRAN_TRU_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GPS_MeasuredResultsList, new_create_dissector_handle(dissect_MeasuredResultsList_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UE_PositionEstimate, new_create_dissector_handle(dissect_UE_PositionEstimate_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_CellId_MeasuredResultsSets, new_create_dissector_handle(dissect_CellId_MeasuredResultsSets_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_OTDOA_MeasurementGroup, new_create_dissector_handle(dissect_OTDOA_MeasurementGroup_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_AccuracyFulfilmentIndicator, new_create_dissector_handle(dissect_AccuracyFulfilmentIndicator_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_HorizontalAccuracyCode, new_create_dissector_handle(dissect_HorizontalAccuracyCode_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_VerticalAccuracyCode, new_create_dissector_handle(dissect_VerticalAccuracyCode_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UTDOA_Group, new_create_dissector_handle(dissect_UTDOA_Group_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UE_PositioningCapability, new_create_dissector_handle(dissect_UE_PositioningCapability_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UC_id, new_create_dissector_handle(dissect_UC_ID_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_ResponseTime, new_create_dissector_handle(dissect_ResponseTime_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PositioningPriority, new_create_dissector_handle(dissect_PositioningPriority_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_ClientType, new_create_dissector_handle(dissect_ClientType_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PositioningMethod, new_create_dissector_handle(dissect_PositioningMethod_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UTDOAPositioning, new_create_dissector_handle(dissect_UTDOAPositioning_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GPSPositioning, new_create_dissector_handle(dissect_GPSPositioning_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_OTDOAAssistanceData, new_create_dissector_handle(dissect_OTDOAAssistanceData_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_Positioning_ResponseTime, new_create_dissector_handle(dissect_Positioning_ResponseTime_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_EnvironmentCharacterisation, new_create_dissector_handle(dissect_EnvironmentCharacterisation_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PositionData, new_create_dissector_handle(dissect_PositionData_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_VelocityEstimate, new_create_dissector_handle(dissect_VelocityEstimate_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UC_ID_InfEx_Rqst, new_create_dissector_handle(dissect_UC_ID_InfEx_Rqst_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UE_PositionEstimateInfo, new_create_dissector_handle(dissect_UE_PositionEstimateInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_OTDOA_MeasuredResultsSets, new_create_dissector_handle(dissect_OTDOA_MeasuredResultsSets_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PeriodicPosCalcInfo, new_create_dissector_handle(dissect_PeriodicPosCalcInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_MeasInstructionsUsed, new_create_dissector_handle(dissect_MeasInstructionsUsed_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_PeriodicTerminationCause, new_create_dissector_handle(dissect_PeriodicTerminationCause_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_IncludeVelocity, new_create_dissector_handle(dissect_IncludeVelocity_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_AmountOfReporting, new_create_dissector_handle(dissect_AmountOfReporting_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_CellIDPositioning, new_create_dissector_handle(dissect_CellIDPositioning_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSSPositioning, new_create_dissector_handle(dissect_GANSSPositioning_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_RRCstateChange, new_create_dissector_handle(dissect_RRCstateChange_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_MeasuredResultsList, new_create_dissector_handle(dissect_GANSS_MeasuredResultsList_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_UTRAN_TRU, new_create_dissector_handle(dissect_GANSS_UTRAN_TRU_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_AdditionalGPSAssistDataRequired, new_create_dissector_handle(dissect_AdditionalGPSAssistDataRequired_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_AdditionalGanssAssistDataRequired, new_create_dissector_handle(dissect_AdditionalGanssAssistDataRequired_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_rxTimingDeviation768Info, new_create_dissector_handle(dissect_RxTimingDeviation768Info_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_rxTimingDeviation384extInfo, new_create_dissector_handle(dissect_RxTimingDeviation384extInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_roundTripTimeInfoWithType1, new_create_dissector_handle(dissect_RoundTripTimeInfoWithType1_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_AddMeasurementInfo, new_create_dissector_handle(dissect_AddMeasurementInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_angleOfArrivalLCR, new_create_dissector_handle(dissect_AngleOfArrivalLCR_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_extendedTimingAdvanceLCR, new_create_dissector_handle(dissect_ExtendedTimingAdvanceLCR_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_PositioningDataSet, new_create_dissector_handle(dissect_GANSS_PositioningDataSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_CommonAssistanceData, new_create_dissector_handle(dissect_GANSS_CommonAssistanceData_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_GenericAssistanceDataList, new_create_dissector_handle(dissect_GANSS_GenericAssistanceDataList_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GPS_ReferenceLocation, new_create_dissector_handle(dissect_GPS_ReferenceLocation_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_UTRAN_GPS_DriftRate, new_create_dissector_handle(dissect_UTRAN_GPS_DriftRate_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GPSReferenceTimeUncertainty, new_create_dissector_handle(dissect_GPSReferenceTimeUncertainty_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_OTDOA_AddMeasuredResultsInfo, new_create_dissector_handle(dissect_OTDOA_AddMeasuredResultsInfo_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_additionalMeasurementInforLCR, new_create_dissector_handle(dissect_AdditionalMeasurementInforLCR_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GNSS_PositioningMethod, new_create_dissector_handle(dissect_GNSS_PositioningMethod_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_NetworkAssistedGANSSSuport, new_create_dissector_handle(dissect_NetworkAssistedGANSSSupport_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_UTRAN_GPSReferenceTime, new_create_dissector_handle(dissect_UTRAN_GPSReferenceTime_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_SBAS_IDs, new_create_dissector_handle(dissect_GANSS_SBAS_IDs_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_Signal_IDs, new_create_dissector_handle(dissect_GANSS_Signal_IDs_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_NAVKeplerianSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ReducedKeplerianSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_MidiAlmanacSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_ALM_GlonassAlmanacSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_ALM_ECEFsbasAlmanacSet_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_UTRAN_GANSSReferenceTimeResult, new_create_dissector_handle(dissect_UTRAN_GANSSReferenceTimeResult_PDU, proto_pcap));
+  dissector_add_uint("pcap.ies", id_GANSS_Reference_Time_Only, new_create_dissector_handle(dissect_GANSS_Reference_Time_Only_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSS_AddADchoices, new_create_dissector_handle(dissect_GANSS_AddADchoices_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_supportGANSSNonNativeADchoices, new_create_dissector_handle(dissect_SupportGANSSNonNativeADchoices_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_PositionDataUEbased, new_create_dissector_handle(dissect_PositionDataUEbased_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssCodePhaseAmbiguityExt, new_create_dissector_handle(dissect_GanssCodePhaseAmbiguityExt_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssIntegerCodePhaseExt, new_create_dissector_handle(dissect_GanssIntegerCodePhaseExt_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSScarrierPhaseRequested, new_create_dissector_handle(dissect_GANSScarrierPhaseRequested_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_GANSSMultiFreqMeasRequested, new_create_dissector_handle(dissect_GANSSMultiFreqMeasRequested_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssReq_AddIonosphericModel, new_create_dissector_handle(dissect_GANSSReq_AddIonosphericModel_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssReq_EarthOrientPara, new_create_dissector_handle(dissect_GANSSReq_EarthOrientPara_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssAddNavigationModel_req, new_create_dissector_handle(dissect_GANSS_AddNavigationModel_Req_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssAddUTCModel_req, new_create_dissector_handle(dissect_GANSS_AddUTCModel_Req_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_ganssAuxInfo_req, new_create_dissector_handle(dissect_GANSS_AuxInfo_req_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_OTDOA_ReferenceCellInfo, new_create_dissector_handle(dissect_OTDOA_ReferenceCellInfoSAS_centric_PDU, proto_pcap));
+  dissector_add_uint("pcap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationRequest_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.sout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationResponse_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.uout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationFailure_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationRequest_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.sout", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationResponse_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.uout", id_InformationExchangeInitiation, new_create_dissector_handle(dissect_InformationExchangeInitiationFailure_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationRequest_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.sout", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationResponse_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.uout", id_PositionInitiation, new_create_dissector_handle(dissect_PositionInitiationFailure_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationRequest_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.sout", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationResponse_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.uout", id_PositionActivation, new_create_dissector_handle(dissect_PositionActivationFailure_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_InformationReporting, new_create_dissector_handle(dissect_InformationReport_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_InformationExchangeTermination, new_create_dissector_handle(dissect_InformationExchangeTerminationRequest_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_InformationExchangeFailure, new_create_dissector_handle(dissect_InformationExchangeFailureIndication_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionParameterModification, new_create_dissector_handle(dissect_PositionParameterModification_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_Abort, new_create_dissector_handle(dissect_Abort_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionPeriodicReport, new_create_dissector_handle(dissect_PositionPeriodicReport_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionPeriodicResult, new_create_dissector_handle(dissect_PositionPeriodicResult_PDU, proto_pcap));
+  dissector_add_uint("pcap.proc.imsg", id_PositionPeriodicTermination, new_create_dissector_handle(dissect_PositionPeriodicTermination_PDU, proto_pcap));
 
 
 /*--- End of included file: packet-pcap-dis-tab.c ---*/
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index fd06257b29..f7e992b736 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -2330,5 +2330,5 @@ proto_reg_handoff_pcep(void)
 	dissector_handle_t pcep_handle;
 
 	pcep_handle = create_dissector_handle(dissect_pcep, proto_pcep);
-	dissector_add("tcp.port", TCP_PORT_PCEP, pcep_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_PCEP, pcep_handle);
 }
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index bc7bfd6140..51b4f34ec4 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -151,10 +151,10 @@ proto_reg_handoff_pcli(void) {
     ip_handle = find_dissector("ip");
     pcli_initialized = TRUE;
   } else {
-    dissector_delete("udp.port",udp_port_pcli,pcli_handle);
+    dissector_delete_uint("udp.port",udp_port_pcli,pcli_handle);
   }
 
   udp_port_pcli = global_udp_port_pcli;
   
-  dissector_add("udp.port",global_udp_port_pcli,pcli_handle);
+  dissector_add_uint("udp.port",global_udp_port_pcli,pcli_handle);
 }
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index b070234b64..ce06f7bcc5 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -269,7 +269,7 @@ proto_reg_handoff_pflog(void)
   data_handle = find_dissector("data");
 
   pflog_handle = create_dissector_handle(dissect_pflog, proto_pflog);
-  dissector_add("wtap_encap", WTAP_ENCAP_PFLOG, pflog_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_PFLOG, pflog_handle);
 }
 
 static void
@@ -390,6 +390,6 @@ proto_reg_handoff_old_pflog(void)
   data_handle = find_dissector("data");
 
   pflog_handle = create_dissector_handle(dissect_old_pflog, proto_old_pflog);
-  dissector_add("wtap_encap", WTAP_ENCAP_OLD_PFLOG, pflog_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_OLD_PFLOG, pflog_handle);
 }
 
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 14bd013d26..e817e89ebe 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -784,12 +784,12 @@ decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,
   next_tvb = tvb_new_subset_remaining(tvb, offset);
 
   /* do lookup with the subdissector table */
-  found = dissector_try_port(subdissector_table, pgmhdr_sport,
+  found = dissector_try_uint(subdissector_table, pgmhdr_sport,
 			next_tvb, pinfo, tree);
   if (found)
 	return;
 
-  found = dissector_try_port(subdissector_table, pgmhdr_dport,
+  found = dissector_try_uint(subdissector_table, pgmhdr_dport,
 			next_tvb, pinfo, tree);
   if (found)
 	return;
@@ -1445,23 +1445,23 @@ proto_reg_handoff_pgm(void)
   if (! initialized) {
     pgm_handle = create_dissector_handle(dissect_pgm, proto_pgm);
     dissector_add_handle("udp.port", pgm_handle);  /* for 'decode-as' */
-    dissector_add("ip.proto", IP_PROTO_PGM, pgm_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_PGM, pgm_handle);
     data_handle = find_dissector("data");
     initialized = TRUE;
   } else {
     if (old_udp_encap_ucast_port != 0) {
-      dissector_delete("udp.port", old_udp_encap_ucast_port, pgm_handle);
+      dissector_delete_uint("udp.port", old_udp_encap_ucast_port, pgm_handle);
     }
     if (old_udp_encap_mcast_port != 0) {
-      dissector_delete("udp.port", old_udp_encap_mcast_port, pgm_handle);
+      dissector_delete_uint("udp.port", old_udp_encap_mcast_port, pgm_handle);
     }
   }
 
   if (udp_encap_ucast_port != 0) {
-    dissector_add("udp.port", udp_encap_ucast_port, pgm_handle);
+    dissector_add_uint("udp.port", udp_encap_ucast_port, pgm_handle);
   }
   if (udp_encap_mcast_port != 0) {
-    dissector_add("udp.port", udp_encap_mcast_port, pgm_handle);
+    dissector_add_uint("udp.port", udp_encap_mcast_port, pgm_handle);
   }
   old_udp_encap_ucast_port = udp_encap_ucast_port;
   old_udp_encap_mcast_port = udp_encap_mcast_port;
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 34b1007cb3..f595624890 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -175,7 +175,7 @@ dissect_pgsql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGSQL");
     if (check_col(pinfo->cinfo, COL_INFO))
         col_set_str(pinfo->cinfo, COL_INFO,
-                    (pinfo->match_port == pinfo->destport) ?
+                    (pinfo->match_uint == pinfo->destport) ?
                      ">" : "<");
 
     tcp_dissect_pdus(tvb, pinfo, tree, pgsql_desegment, 5,
@@ -216,7 +216,7 @@ dissect_pgsql_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     const char *typestr;
     guint length;
     gboolean info = check_col(pinfo->cinfo, COL_INFO);
-    gboolean fe = (pinfo->match_port == pinfo->destport);
+    gboolean fe = (pinfo->match_uint == pinfo->destport);
 
     n = 0;
     type = tvb_get_guint8(tvb, 0);
@@ -856,10 +856,10 @@ proto_reg_handoff_pgsql(void)
         pgsql_handle = create_dissector_handle(dissect_pgsql, proto_pgsql);
         initialized = TRUE;
     } else {
-        dissector_delete("tcp.port", saved_pgsql_port, pgsql_handle);
+        dissector_delete_uint("tcp.port", saved_pgsql_port, pgsql_handle);
     }
 
-    dissector_add("tcp.port", pgsql_port, pgsql_handle);
+    dissector_add_uint("tcp.port", pgsql_port, pgsql_handle);
     saved_pgsql_port = pgsql_port;
 }
 
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 44d022a81a..ffb0c840ee 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -1248,7 +1248,7 @@ proto_reg_handoff_pim(void)
     dissector_handle_t pim_handle;
 
     pim_handle = create_dissector_handle(dissect_pim, proto_pim);
-    dissector_add("ip.proto", IP_PROTO_PIM, pim_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_PIM, pim_handle);
 
     /*
      * Get handles for the IPv4 and IPv6 dissectors.
diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c
index 1a9c105e8a..7d0212c00a 100644
--- a/epan/dissectors/packet-pingpongprotocol.c
+++ b/epan/dissectors/packet-pingpongprotocol.c
@@ -202,5 +202,5 @@ proto_reg_handoff_pingpongprotocol(void)
   dissector_handle_t pingpongprotocol_handle;
 
   pingpongprotocol_handle = new_create_dissector_handle(dissect_pingpongprotocol, proto_pingpongprotocol);
-  dissector_add("sctp.ppi", PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID, pingpongprotocol_handle);
+  dissector_add_uint("sctp.ppi", PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID, pingpongprotocol_handle);
 }
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index b8db1c0fee..3022bafbaf 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -560,7 +560,7 @@ dissect_pktc_mtafqdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     if (check_col(pinfo->cinfo, COL_INFO)) {
         col_add_fstr(pinfo->cinfo, COL_INFO, "MTA FQDN %s",
-                    pinfo->srcport == pinfo->match_port ? "Reply":"Request");
+                    pinfo->srcport == pinfo->match_uint ? "Reply":"Request");
     }
 
 
@@ -743,7 +743,7 @@ proto_reg_handoff_pktc(void)
     dissector_handle_t pktc_handle;
 
     pktc_handle = create_dissector_handle(dissect_pktc, proto_pktc);
-    dissector_add("udp.port", PKTC_PORT, pktc_handle);
+    dissector_add_uint("udp.port", PKTC_PORT, pktc_handle);
 }
 
 
@@ -792,5 +792,5 @@ proto_reg_handoff_pktc_mtafqdn(void)
     dissector_handle_t pktc_mtafqdn_handle;
 
     pktc_mtafqdn_handle = create_dissector_handle(dissect_pktc_mtafqdn, proto_pktc);
-    dissector_add("udp.port", PKTC_MTAFQDN_PORT, pktc_mtafqdn_handle);
+    dissector_add_uint("udp.port", PKTC_MTAFQDN_PORT, pktc_mtafqdn_handle);
 }
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index 36f9219171..7d523694c8 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -1353,6 +1353,6 @@ void proto_reg_handoff_pnrp(void)
 {
 	dissector_handle_t pnrp_handle;
 	pnrp_handle = new_create_dissector_handle(dissect_pnrp, proto_pnrp);
-	dissector_add("udp.port",PNRP_PORT,pnrp_handle);
+	dissector_add_uint("udp.port",PNRP_PORT,pnrp_handle);
 }
 
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index d2027af9e5..fa9d5701d3 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -148,7 +148,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
   line = tvb_get_ptr(tvb, offset, linelen);
 
-  if (pinfo->match_port == pinfo->destport) {
+  if (pinfo->match_uint == pinfo->destport) {
     is_request = TRUE;
     is_continuation = FALSE;
   } else {
@@ -450,7 +450,7 @@ proto_reg_handoff_pop(void)
   dissector_handle_t pop_handle;
 
   pop_handle = find_dissector("pop");
-  dissector_add("tcp.port", TCP_PORT_POP, pop_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_POP, pop_handle);
   ssl_dissector_add(TCP_PORT_SSL_POP, "pop", TRUE);
   data_handle = find_dissector("data");
 
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 0854f07e96..22d2120cc9 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -1003,7 +1003,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (is_ht) { /* We didn't hit the reassembly code */
         call_dissector(ieee80211_ht_handle, next_tvb, pinfo, tree);
     } else {
-        dissector_try_port(wtap_encap_dissector_table,
+        dissector_try_uint(wtap_encap_dissector_table,
             wtap_pcap_encap_to_wtap_encap(dlt), next_tvb, pinfo, tree);
     }
 }
@@ -1364,7 +1364,7 @@ proto_reg_handoff_ppi(void)
     ppi_harris_test_handle = find_dissector("ppi_harris_test");
     ppi_antenna_handle = find_dissector("ppi_antenna");
 
-    dissector_add("wtap_encap", WTAP_ENCAP_PPI, ppi_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_PPI, ppi_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 448727a267..7cb9e47f83 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -3181,7 +3181,7 @@ dissect_cp( tvbuff_t *tvb, int proto_id, int proto_subtree_index,
 
         /* Decode the rejected packet. */
         next_tvb = tvb_new_subset(tvb, offset, length, length);
-        if (!dissector_try_port(ppp_subdissector_table, protocol,
+        if (!dissector_try_uint(ppp_subdissector_table, protocol,
                                 next_tvb, pinfo, fh_tree)) {
           call_dissector(data_handle, next_tvb, pinfo, fh_tree);
         }
@@ -3258,7 +3258,7 @@ dissect_ppp_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   next_tvb = tvb_new_subset_remaining(tvb, proto_len);
 
   /* do lookup with the subdissector table */
-  if (!dissector_try_port(ppp_subdissector_table, ppp_prot, next_tvb, pinfo, tree)) {
+  if (!dissector_try_uint(ppp_subdissector_table, ppp_prot, next_tvb, pinfo, tree)) {
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
       col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", ppp_prot);
     if (check_col(pinfo->cinfo, COL_INFO))
@@ -3372,7 +3372,7 @@ dissect_vsnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   next_tvb = tvb_new_subset(tvb, 1, -1, -1);
 
   /* do lookup with the subdissector table */
-  if (!dissector_try_port(ppp_subdissector_table, PPP_IP, next_tvb, pinfo, tree))
+  if (!dissector_try_uint(ppp_subdissector_table, PPP_IP, next_tvb, pinfo, tree))
   {
     col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", PPP_IP);
 
@@ -3725,7 +3725,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
       next_tvb = tvb_new_subset(tvb,offset,length,length);
 
-      if (!dissector_try_port(ppp_subdissector_table, pid, next_tvb, pinfo, info_tree)) {
+      if (!dissector_try_uint(ppp_subdissector_table, pid, next_tvb, pinfo, info_tree)) {
         call_dissector(data_handle, next_tvb, pinfo, info_tree);
       }
       offset += length;
@@ -3863,7 +3863,7 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     add_new_data_source(pinfo, next_tvb, "Decompressed Data");
     tvb_set_free_cb(next_tvb, g_free);
 
-    if (!dissector_try_port(ppp_subdissector_table, PPP_IP, next_tvb, pinfo, info_tree)) {
+    if (!dissector_try_uint(ppp_subdissector_table, PPP_IP, next_tvb, pinfo, info_tree)) {
       call_dissector_only(data_handle, next_tvb, pinfo, info_tree);
     }
   } /* if tree */
@@ -4428,13 +4428,13 @@ proto_reg_handoff_ppp_raw_hdlc(void)
   dissector_handle_t ppp_usb_handle;
 
   ppp_raw_hdlc_handle = create_dissector_handle(dissect_ppp_raw_hdlc, proto_ppp);
-  dissector_add("gre.proto", ETHERTYPE_CDMA2000_A10_UBS, ppp_raw_hdlc_handle);
-  dissector_add("gre.proto", ETHERTYPE_3GPP2, ppp_raw_hdlc_handle);
+  dissector_add_uint("gre.proto", ETHERTYPE_CDMA2000_A10_UBS, ppp_raw_hdlc_handle);
+  dissector_add_uint("gre.proto", ETHERTYPE_3GPP2, ppp_raw_hdlc_handle);
 
   ppp_usb_handle = create_dissector_handle(dissect_ppp_usb, proto_ppp);
-  dissector_add("usb.bulk", IF_CLASS_UNKNOWN, ppp_usb_handle);
-  dissector_add("usb.bulk", IF_CLASS_VENDOR_SPECIFIC, ppp_usb_handle);
-  dissector_add("usb.bulk", IF_CLASS_CDC_DATA, ppp_usb_handle);
+  dissector_add_uint("usb.bulk", IF_CLASS_UNKNOWN, ppp_usb_handle);
+  dissector_add_uint("usb.bulk", IF_CLASS_VENDOR_SPECIFIC, ppp_usb_handle);
+  dissector_add_uint("usb.bulk", IF_CLASS_CDC_DATA, ppp_usb_handle);
 }
 
 /*
@@ -4751,14 +4751,14 @@ proto_reg_handoff_ppp(void)
   data_handle = find_dissector("data");
 
   ppp_handle = find_dissector("ppp");
-  dissector_add("fr.ietf", NLPID_PPP, ppp_handle);
+  dissector_add_uint("fr.ietf", NLPID_PPP, ppp_handle);
 
   ppp_hdlc_handle = find_dissector("ppp_hdlc");
-  dissector_add("wtap_encap", WTAP_ENCAP_PPP, ppp_hdlc_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, ppp_hdlc_handle);
-  dissector_add("sll.ltype", LINUX_SLL_P_PPPHDLC, ppp_hdlc_handle);
-  dissector_add("osinl.excl", NLPID_PPP, ppp_handle);
-  dissector_add("gre.proto", ETHERTYPE_PPP, ppp_hdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP, ppp_hdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, ppp_hdlc_handle);
+  dissector_add_uint("sll.ltype", LINUX_SLL_P_PPPHDLC, ppp_hdlc_handle);
+  dissector_add_uint("osinl.excl", NLPID_PPP, ppp_handle);
+  dissector_add_uint("gre.proto", ETHERTYPE_PPP, ppp_hdlc_handle);
 }
 
 void
@@ -4808,7 +4808,7 @@ proto_reg_handoff_mp(void)
   dissector_handle_t mp_handle;
 
   mp_handle = create_dissector_handle(dissect_mp, proto_mp);
-  dissector_add("ppp.protocol", PPP_MP, mp_handle);
+  dissector_add_uint("ppp.protocol", PPP_MP, mp_handle);
 }
 
 void
@@ -4837,7 +4837,7 @@ proto_reg_handoff_lcp(void)
   dissector_handle_t lcp_handle;
 
   lcp_handle = create_dissector_handle(dissect_lcp, proto_lcp);
-  dissector_add("ppp.protocol", PPP_LCP, lcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_LCP, lcp_handle);
 
   /*
    * NDISWAN on Windows translates Ethernet frames from higher-level
@@ -4855,12 +4855,12 @@ proto_reg_handoff_lcp(void)
    * "ethertype" dissector table as well as the PPP protocol dissector
    * table.
    */
-  dissector_add("ethertype", PPP_LCP, lcp_handle);
+  dissector_add_uint("ethertype", PPP_LCP, lcp_handle);
 
   /*
    * for GSM-A / MobileL3 / GPRS SM / PCO
    */
-  dissector_add("sm_pco.protocol", PPP_LCP, lcp_handle);
+  dissector_add_uint("sm_pco.protocol", PPP_LCP, lcp_handle);
 
 }
 
@@ -4883,7 +4883,7 @@ proto_reg_handoff_vsncp(void)
   dissector_handle_t vsncp_handle;
 
   vsncp_handle = create_dissector_handle(dissect_vsncp, proto_vsncp);
-  dissector_add("ppp.protocol", PPP_VSNCP, vsncp_handle);
+  dissector_add_uint("ppp.protocol", PPP_VSNCP, vsncp_handle);
 }
 
 void
@@ -4913,7 +4913,7 @@ proto_reg_handoff_vsnp(void)
   dissector_handle_t vsnp_handle;
 
   vsnp_handle = create_dissector_handle(dissect_vsnp, proto_vsnp);
-  dissector_add("ppp.protocol", PPP_VSNP, vsnp_handle);
+  dissector_add_uint("ppp.protocol", PPP_VSNP, vsnp_handle);
 }
 
 void
@@ -4937,18 +4937,18 @@ proto_reg_handoff_ipcp(void)
   dissector_handle_t ipcp_handle;
 
   ipcp_handle = create_dissector_handle(dissect_ipcp, proto_ipcp);
-  dissector_add("ppp.protocol", PPP_IPCP, ipcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_IPCP, ipcp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_IPCP, ipcp_handle);
+  dissector_add_uint("ethertype", PPP_IPCP, ipcp_handle);
 
   /*
    * for GSM-A / MobileL3 / GPRS SM / PCO
    */
-  dissector_add("sm_pco.protocol", PPP_IPCP, ipcp_handle);
+  dissector_add_uint("sm_pco.protocol", PPP_IPCP, ipcp_handle);
 
 }
 
@@ -5013,7 +5013,7 @@ proto_reg_handoff_bcp(void)
   eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
   bcp_handle = create_dissector_handle(dissect_bcp, proto_bcp);
-  dissector_add("ppp.protocol", PPP_BCP, bcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_BCP, bcp_handle);
 }
 
 void
@@ -5022,13 +5022,13 @@ proto_reg_handoff_osicp(void)
   dissector_handle_t osicp_handle;
 
   osicp_handle = create_dissector_handle(dissect_osicp, proto_osicp);
-  dissector_add("ppp.protocol", PPP_OSICP, osicp_handle);
+  dissector_add_uint("ppp.protocol", PPP_OSICP, osicp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_OSICP, osicp_handle);
+  dissector_add_uint("ethertype", PPP_OSICP, osicp_handle);
 }
 
 void
@@ -5056,13 +5056,13 @@ proto_reg_handoff_ccp(void)
   dissector_handle_t ccp_handle;
 
   ccp_handle = create_dissector_handle(dissect_ccp, proto_ccp);
-  dissector_add("ppp.protocol", PPP_CCP, ccp_handle);
+  dissector_add_uint("ppp.protocol", PPP_CCP, ccp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_CCP, ccp_handle);
+  dissector_add_uint("ethertype", PPP_CCP, ccp_handle);
 }
 
 void
@@ -5086,13 +5086,13 @@ proto_reg_handoff_cbcp(void)
   dissector_handle_t cbcp_handle;
 
   cbcp_handle = create_dissector_handle(dissect_cbcp, proto_cbcp);
-  dissector_add("ppp.protocol", PPP_CBCP, cbcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_CBCP, cbcp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_CBCP, cbcp_handle);
+  dissector_add_uint("ethertype", PPP_CBCP, cbcp_handle);
 }
 
 void
@@ -5115,13 +5115,13 @@ proto_reg_handoff_bacp(void)
   dissector_handle_t bacp_handle;
 
   bacp_handle = create_dissector_handle(dissect_bacp, proto_bacp);
-  dissector_add("ppp.protocol", PPP_BACP, bacp_handle);
+  dissector_add_uint("ppp.protocol", PPP_BACP, bacp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_BACP, bacp_handle);
+  dissector_add_uint("ethertype", PPP_BACP, bacp_handle);
 }
 
 void
@@ -5147,13 +5147,13 @@ proto_reg_handoff_bap(void)
   dissector_handle_t bap_handle;
 
   bap_handle = create_dissector_handle(dissect_bap, proto_bap);
-  dissector_add("ppp.protocol", PPP_BAP, bap_handle);
+  dissector_add_uint("ppp.protocol", PPP_BAP, bap_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_BAP, bap_handle);
+  dissector_add_uint("ethertype", PPP_BAP, bap_handle);
 }
 
 void
@@ -5175,13 +5175,13 @@ proto_reg_handoff_comp_data(void)
 
   comp_data_handle = create_dissector_handle(dissect_comp_data,
                                              proto_comp_data);
-  dissector_add("ppp.protocol", PPP_COMP, comp_data_handle);
+  dissector_add_uint("ppp.protocol", PPP_COMP, comp_data_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_COMP, comp_data_handle);
+  dissector_add_uint("ethertype", PPP_COMP, comp_data_handle);
 }
 
 void
@@ -5252,18 +5252,18 @@ proto_reg_handoff_pap(void)
   dissector_handle_t pap_handle;
 
   pap_handle = create_dissector_handle(dissect_pap, proto_pap);
-  dissector_add("ppp.protocol", PPP_PAP, pap_handle);
+  dissector_add_uint("ppp.protocol", PPP_PAP, pap_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_PAP, pap_handle);
+  dissector_add_uint("ethertype", PPP_PAP, pap_handle);
 
   /*
    * for GSM-A / MobileL3 / GPRS SM / PCO
    */
-  dissector_add("sm_pco.protocol", PPP_PAP, pap_handle);
+  dissector_add_uint("sm_pco.protocol", PPP_PAP, pap_handle);
 }
 
 void
@@ -5329,18 +5329,18 @@ void
 proto_reg_handoff_chap(void)
 {
   dissector_handle_t chap_handle = create_dissector_handle(dissect_chap, proto_chap);
-  dissector_add("ppp.protocol", PPP_CHAP, chap_handle);
+  dissector_add_uint("ppp.protocol", PPP_CHAP, chap_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_CHAP, chap_handle);
+  dissector_add_uint("ethertype", PPP_CHAP, chap_handle);
 
   /*
    * for GSM-A / MobileL3 / GPRS SM / PCO
    */
-  dissector_add("sm_pco.protocol", PPP_CHAP, chap_handle);
+  dissector_add_uint("sm_pco.protocol", PPP_CHAP, chap_handle);
 }
 
 void
@@ -5364,13 +5364,13 @@ proto_reg_handoff_pppmuxcp(void)
   dissector_handle_t muxcp_handle;
 
   muxcp_handle = create_dissector_handle(dissect_pppmuxcp, proto_pppmuxcp);
-  dissector_add("ppp.protocol", PPP_MUXCP, muxcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_MUXCP, muxcp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_MUXCP, muxcp_handle);
+  dissector_add_uint("ethertype", PPP_MUXCP, muxcp_handle);
 }
 
 
@@ -5406,13 +5406,13 @@ proto_reg_handoff_pppmux(void)
   dissector_handle_t pppmux_handle;
 
   pppmux_handle = create_dissector_handle(dissect_pppmux, proto_pppmux);
-  dissector_add("ppp.protocol", PPP_MUX, pppmux_handle);
+  dissector_add_uint("ppp.protocol", PPP_MUX, pppmux_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_MUX, pppmux_handle);
+  dissector_add_uint("ethertype", PPP_MUX, pppmux_handle);
 }
 
 void
@@ -5434,13 +5434,13 @@ proto_reg_handoff_mplscp(void)
   dissector_handle_t mplscp_handle;
 
   mplscp_handle = create_dissector_handle(dissect_mplscp, proto_mplscp);
-  dissector_add("ppp.protocol", PPP_MPLSCP, mplscp_handle);
+  dissector_add_uint("ppp.protocol", PPP_MPLSCP, mplscp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_MPLSCP, mplscp_handle);
+  dissector_add_uint("ethertype", PPP_MPLSCP, mplscp_handle);
 }
 
 void
@@ -5462,13 +5462,13 @@ proto_reg_handoff_cdpcp(void)
   dissector_handle_t cdpcp_handle;
 
   cdpcp_handle = create_dissector_handle(dissect_cdpcp, proto_cdpcp);
-  dissector_add("ppp.protocol", PPP_CDPCP, cdpcp_handle);
+  dissector_add_uint("ppp.protocol", PPP_CDPCP, cdpcp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_CDPCP, cdpcp_handle);
+  dissector_add_uint("ethertype", PPP_CDPCP, cdpcp_handle);
 }
 
 void
@@ -5492,13 +5492,13 @@ proto_reg_handoff_ipv6cp(void)
   dissector_handle_t ipv6cp_handle;
 
   ipv6cp_handle = create_dissector_handle(dissect_ipv6cp, proto_ipv6cp);
-  dissector_add("ppp.protocol", PPP_IPV6CP, ipv6cp_handle);
+  dissector_add_uint("ppp.protocol", PPP_IPV6CP, ipv6cp_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_IPV6CP, ipv6cp_handle);
+  dissector_add_uint("ethertype", PPP_IPV6CP, ipv6cp_handle);
 }
 
 void
@@ -5568,23 +5568,23 @@ proto_reg_handoff_iphc_crtp(void)
   dissector_handle_t cs_handle;
 
   fh_handle = create_dissector_handle(dissect_iphc_crtp_fh, proto_iphc_crtp);
-  dissector_add("ppp.protocol", PPP_RTP_FH, fh_handle);
+  dissector_add_uint("ppp.protocol", PPP_RTP_FH, fh_handle);
 
   cudp16_handle = create_dissector_handle(dissect_iphc_crtp_cudp16, proto_iphc_crtp);
-  dissector_add("ppp.protocol", PPP_RTP_CUDP16, cudp16_handle);
+  dissector_add_uint("ppp.protocol", PPP_RTP_CUDP16, cudp16_handle);
 
   cudp8_handle = create_dissector_handle(dissect_iphc_crtp_cudp8, proto_iphc_crtp);
-  dissector_add("ppp.protocol", PPP_RTP_CUDP8, cudp16_handle);
+  dissector_add_uint("ppp.protocol", PPP_RTP_CUDP8, cudp16_handle);
 
   cs_handle = create_dissector_handle(dissect_iphc_crtp_cs, proto_iphc_crtp);
-  dissector_add("ppp.protocol", PPP_RTP_CS, cs_handle);
+  dissector_add_uint("ppp.protocol", PPP_RTP_CS, cs_handle);
 
   /*
    * See above comment about NDISWAN for an explanation of why we're
    * registering with the "ethertype" dissector table.
    */
-  dissector_add("ethertype", PPP_RTP_FH, fh_handle);
-  dissector_add("ethertype", PPP_RTP_CUDP16, cudp16_handle);
-  dissector_add("ethertype", PPP_RTP_CUDP8, cudp16_handle);
-  dissector_add("ethertype", PPP_RTP_CS, cs_handle);
+  dissector_add_uint("ethertype", PPP_RTP_FH, fh_handle);
+  dissector_add_uint("ethertype", PPP_RTP_CUDP16, cudp16_handle);
+  dissector_add_uint("ethertype", PPP_RTP_CUDP8, cudp16_handle);
+  dissector_add_uint("ethertype", PPP_RTP_CS, cs_handle);
 }
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index dae6506cce..a6c0205d4d 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -1036,7 +1036,7 @@ void proto_reg_handoff_pppoed(void)
 	dissector_handle_t pppoed_handle;
 
 	pppoed_handle = create_dissector_handle(dissect_pppoed, proto_pppoed);
-	dissector_add("ethertype", ETHERTYPE_PPPOED, pppoed_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_PPPOED, pppoed_handle);
 }
 
 
@@ -1292,7 +1292,7 @@ void proto_reg_handoff_pppoes(void)
 {
 	dissector_handle_t pppoes_handle  =
 	    create_dissector_handle(dissect_pppoes, proto_pppoes);
-	dissector_add("ethertype", ETHERTYPE_PPPOES, pppoes_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_PPPOES, pppoes_handle);
 
 	/* Get a handle for the PPP dissector */
 	ppp_handle = find_dissector("ppp");
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index e29f07f66f..04417f8572 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -881,6 +881,6 @@ proto_reg_handoff_pptp(void)
   dissector_handle_t pptp_handle;
 
   pptp_handle = create_dissector_handle(dissect_pptp, proto_pptp);
-  dissector_add("tcp.port", TCP_PORT_PPTP, pptp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_PPTP, pptp_handle);
   data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c
index 51e2210c7b..5d1dd3e2fe 100644
--- a/epan/dissectors/packet-prp.c
+++ b/epan/dissectors/packet-prp.c
@@ -363,7 +363,7 @@ void proto_reg_handoff_prp(void)
         dissector_handle_t prp_redundancy_control_trailer_handle;
 
         prp_supervision_frame_handle = create_dissector_handle(dissect_prp_supervision_frame, proto_prp);
-        dissector_add("ethertype", ETHERTYPE_PRP, prp_supervision_frame_handle);
+        dissector_add_uint("ethertype", ETHERTYPE_PRP, prp_supervision_frame_handle);
 
         prp_redundancy_control_trailer_handle = create_dissector_handle(dissect_prp_redundancy_control_trailer, proto_prp);
         register_postdissector(prp_redundancy_control_trailer_handle);
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index c34a63e2b4..fdb2537909 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -5600,7 +5600,7 @@ proto_reg_handoff_ptp(void)
     general_port_ptp_handle = create_dissector_handle(dissect_ptp, proto_ptp);
     ethertype_ptp_handle = create_dissector_handle(dissect_ptp_oE, proto_ptp);
 
-    dissector_add("udp.port", EVENT_PORT_PTP, event_port_ptp_handle);
-    dissector_add("udp.port", GENERAL_PORT_PTP, general_port_ptp_handle);
-    dissector_add("ethertype", ETHERTYPE_PTP, ethertype_ptp_handle);
+    dissector_add_uint("udp.port", EVENT_PORT_PTP, event_port_ptp_handle);
+    dissector_add_uint("udp.port", GENERAL_PORT_PTP, general_port_ptp_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_PTP, ethertype_ptp_handle);
 }
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 9f6c39d02e..81186706f7 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -3614,7 +3614,7 @@ proto_reg_handoff_pvfs(void)
 	dissector_handle_t pvfs_handle;
 
 	pvfs_handle = new_create_dissector_handle(dissect_pvfs_heur, proto_pvfs);
-	dissector_add("tcp.port", TCP_PORT_PVFS2, pvfs_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_PVFS2, pvfs_handle);
 
 	heur_dissector_add("tcp", dissect_pvfs_heur, proto_pvfs);
 }
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 281406b059..47161624cf 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -1973,13 +1973,13 @@ void proto_reg_handoff_pw_atm_ata(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("mpls_pw_atm_n1_cw");
-	dissector_add( "mpls.label", LABEL_INVALID, h );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, h );
 	h = find_dissector("mpls_pw_atm_n1_nocw");
-	dissector_add( "mpls.label", LABEL_INVALID, h );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, h );
 	h = find_dissector("mpls_pw_atm_11_or_aal5_pdu");
-	dissector_add( "mpls.label", LABEL_INVALID, h );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, h );
 	h = find_dissector("mpls_pw_atm_aal5_sdu");
-	dissector_add( "mpls.label", LABEL_INVALID, h );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, h );
 
 	dh_cell = find_dissector("mpls_pw_atm_cell");
 	dh_cell_header = find_dissector("mpls_pw_atm_cell_header");
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 4856464825..323829440a 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -445,7 +445,7 @@ void proto_reg_handoff_pw_cesopsn(void)
 {
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
-	dissector_add("mpls.label", LABEL_INVALID, find_dissector("pw_cesopsn_mpls"));
+	dissector_add_uint("mpls.label", LABEL_INVALID, find_dissector("pw_cesopsn_mpls"));
 	dissector_add_handle("udp.port", find_dissector("pw_cesopsn_udp")); /* For Decode-As */
 	return;
 }
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index aab32e0687..985b34266e 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -222,11 +222,11 @@ proto_reg_handoff_pw_eth(void)
         eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
         pw_eth_handle_cw = find_dissector("pw_eth_cw");
-        dissector_add("mpls.label", LABEL_INVALID, pw_eth_handle_cw);
+        dissector_add_uint("mpls.label", LABEL_INVALID, pw_eth_handle_cw);
 
         pw_eth_handle_nocw = find_dissector("pw_eth_nocw");
-        dissector_add("mpls.label", LABEL_INVALID, pw_eth_handle_nocw);
+        dissector_add_uint("mpls.label", LABEL_INVALID, pw_eth_handle_nocw);
 
         pw_eth_handle_heuristic = find_dissector("pw_eth_heuristic");
-        dissector_add("mpls.label", LABEL_INVALID, pw_eth_handle_heuristic);
+        dissector_add_uint("mpls.label", LABEL_INVALID, pw_eth_handle_heuristic);
 }
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index 27acb0fe8c..b6586464f7 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -297,6 +297,6 @@ proto_reg_handoff_pw_fr(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("pw_fr");
-	dissector_add("mpls.label", LABEL_INVALID, h);
+	dissector_add_uint("mpls.label", LABEL_INVALID, h);
 	fr_stripped_address_handle = find_dissector("fr_stripped_address");
 }
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index c3b932d548..38f543f597 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -250,10 +250,10 @@ void proto_reg_handoff_pw_hdlc(void)
 	dissector_handle_t handle;
 
 	handle = find_dissector("pw_hdlc_nocw_fr");
-	dissector_add( "mpls.label", LABEL_INVALID, handle );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, handle );
 
 	handle = find_dissector("pw_hdlc_nocw_hdlc_ppp");
-	dissector_add( "mpls.label", LABEL_INVALID, handle );
+	dissector_add_uint( "mpls.label", LABEL_INVALID, handle );
 
 	ppp_handle = find_dissector( "ppp" );
 	fr_handle = find_dissector( "fr" );
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 1a49dc244e..222ed720fd 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -460,6 +460,6 @@ void proto_reg_handoff_pw_satop(void)
 {
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
-	dissector_add("mpls.label", LABEL_INVALID, find_dissector("pw_satop_mpls"));
+	dissector_add_uint("mpls.label", LABEL_INVALID, find_dissector("pw_satop_mpls"));
 	dissector_add_handle("udp.port", find_dissector("pw_satop_udp")); /* for Decode-As */
 }
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index f36ee830f1..9c98dafa8c 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -2762,11 +2762,11 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree,
 			 * Check for subdissectors for this IE or
 			 * for all IEs in this codeset.
 			 */
-			if (dissector_get_port_handle(codeset_dissector_table, codeset) ||
-			    dissector_get_port_handle(ie_dissector_table, (codeset << 8) | (info_element & Q931_IE_SO_IDENTIFIER_MASK))) {
+			if (dissector_get_uint_handle(codeset_dissector_table, codeset) ||
+			    dissector_get_uint_handle(ie_dissector_table, (codeset << 8) | (info_element & Q931_IE_SO_IDENTIFIER_MASK))) {
 				next_tvb = tvb_new_subset (tvb, offset, 1, 1);
-				if (dissector_try_port(ie_dissector_table, (codeset << 8) | (info_element & Q931_IE_SO_IDENTIFIER_MASK), next_tvb, pinfo, q931_tree) ||
-				    dissector_try_port(codeset_dissector_table, codeset, next_tvb, pinfo, q931_tree)) {
+				if (dissector_try_uint(ie_dissector_table, (codeset << 8) | (info_element & Q931_IE_SO_IDENTIFIER_MASK), next_tvb, pinfo, q931_tree) ||
+				    dissector_try_uint(codeset_dissector_table, codeset, next_tvb, pinfo, q931_tree)) {
 					offset += 1;
 					codeset = locked_codeset;
 					continue;
@@ -2920,11 +2920,11 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree,
 			 * Check for subdissectors for this IE or
 			 * for all IEs in this codeset.
 			 */
-			if (dissector_get_port_handle(codeset_dissector_table, codeset) ||
-			    dissector_get_port_handle(ie_dissector_table, (codeset << 8) | info_element)) {
+			if (dissector_get_uint_handle(codeset_dissector_table, codeset) ||
+			    dissector_get_uint_handle(ie_dissector_table, (codeset << 8) | info_element)) {
 				next_tvb = tvb_new_subset (tvb, offset, info_element_len + 2, info_element_len + 2);
-				if (dissector_try_port(ie_dissector_table, (codeset << 8) | info_element, next_tvb, pinfo, q931_tree) ||
-				    dissector_try_port(codeset_dissector_table, codeset, next_tvb, pinfo, q931_tree)) {
+				if (dissector_try_uint(ie_dissector_table, (codeset << 8) | info_element, next_tvb, pinfo, q931_tree) ||
+				    dissector_try_uint(codeset_dissector_table, codeset, next_tvb, pinfo, q931_tree)) {
 					offset += 2 + info_element_len;
 					codeset = locked_codeset;
 					continue;
@@ -3592,10 +3592,10 @@ proto_reg_handoff_q931(void)
 	dissector_handle_t q931_over_ip_handle;
 
 	q931_handle = find_dissector("q931");
-	dissector_add("lapd.sapi", LAPD_SAPI_Q931, q931_handle);
+	dissector_add_uint("lapd.sapi", LAPD_SAPI_Q931, q931_handle);
 
 	q931_over_ip_handle = find_dissector("q931.over_ip");
-	dissector_add("sctp.ppi", H323_PAYLOAD_PROTOCOL_ID, q931_over_ip_handle);
+	dissector_add_uint("sctp.ppi", H323_PAYLOAD_PROTOCOL_ID, q931_over_ip_handle);
 
 	/*
 	 * Attempt to get a handle for the H.225 dissector.
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 99abc58478..bf56b7f914 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -281,7 +281,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
   actx->rose_ctx->d.pdu = 1;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) {
-    arg_handle = dissector_get_port_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
+    arg_handle = dissector_get_uint_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->arg_global_dissector_table) {
     arg_handle = dissector_get_string_handle(actx->rose_ctx->arg_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
@@ -374,7 +374,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
   actx->rose_ctx->d.pdu = 2;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) {
-    res_handle = dissector_get_port_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
+    res_handle = dissector_get_uint_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->res_global_dissector_table) {
     res_handle = dissector_get_string_handle(actx->rose_ctx->res_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
@@ -454,7 +454,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
   actx->rose_ctx->d.pdu = 3;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) {
-    err_handle = dissector_get_port_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
+    err_handle = dissector_get_uint_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->err_global_dissector_table) {
     err_handle = dissector_get_string_handle(actx->rose_ctx->err_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 0bc43059aa..3694b953ae 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -1009,9 +1009,9 @@ void proto_reg_handoff_q932(void) {
 
   q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
   /* Facility */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
   /* Notification indicator */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
 
   q932_ros_handle = find_dissector("q932.ros");
 }
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 1b76158d7a..2ac96e2447 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -2278,5 +2278,5 @@ proto_reg_handoff_q933(void)
 	dissector_handle_t q933_handle;
 
 	q933_handle = find_dissector("q933");
-	dissector_add("fr.osinl", NLPID_Q_933, q933_handle);
+	dissector_add_uint("fr.osinl", NLPID_Q_933, q933_handle);
 }
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index d58d27bfc0..9e9ffb2b0b 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -16325,8 +16325,8 @@ void proto_reg_handoff_qsig(void) {
   qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
   qsig_res_handle = new_create_dissector_handle(dissect_qsig_res, proto_qsig);
   for (i=0; i<(int)array_length(qsig_op_tab); i++) {
-    dissector_add("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
-    dissector_add("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
+    dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
+    dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
     key = qsig_op_tab[i].opcode;
     oid = g_hash_table_lookup(qsig_opcode2oid_hashtable, &key);
     if (oid) {
@@ -16336,16 +16336,16 @@ void proto_reg_handoff_qsig(void) {
   }
   qsig_err_handle = new_create_dissector_handle(dissect_qsig_err, proto_qsig);
   for (i=0; i<(int)array_length(qsig_err_tab); i++) {
-    dissector_add("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
+    dissector_add_uint("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
   }
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
   /* QSIG-TC - Transit counter */
-  dissector_add("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
   /* SSIG-BC - Party category */
-  dissector_add("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
   /* RFC 3204, 3.2 QSIG Media Type */
   dissector_add_string("media_type", "application/qsig", q931_handle);
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index 28efb0a09f..9f083b0905 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -647,13 +647,13 @@ proto_reg_handoff_quake(void)
 		data_handle = find_dissector("data");
 		Initialized=TRUE;
 	} else {
-		dissector_delete("udp.port", ServerPort, quake_handle);
+		dissector_delete_uint("udp.port", ServerPort, quake_handle);
 	}
 
 	/* set port for future deletes */
 	ServerPort=gbl_quakeServerPort;
 
-	dissector_add("udp.port", gbl_quakeServerPort, quake_handle);
+	dissector_add_uint("udp.port", gbl_quakeServerPort, quake_handle);
 }
 
 
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 24f232c7ec..c930c74146 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -891,13 +891,13 @@ proto_reg_handoff_quake2(void)
 		data_handle = find_dissector("data");
 		Initialized=TRUE;
 	} else {
-		dissector_delete("udp.port", ServerPort, quake2_handle);
+		dissector_delete_uint("udp.port", ServerPort, quake2_handle);
 	}
 
         /* set port for future deletes */
         ServerPort=gbl_quake2ServerPort;
 
-	dissector_add("udp.port", gbl_quake2ServerPort, quake2_handle);
+	dissector_add_uint("udp.port", gbl_quake2ServerPort, quake2_handle);
 }
 
 
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index 61fb11f729..eab35c85c4 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -616,9 +616,9 @@ proto_reg_handoff_quake3(void)
 		initialized=TRUE;
 	} else {
 		for (i=0;i<4;i++)
-			dissector_delete("udp.port", server_port+i, quake3_handle);
+			dissector_delete_uint("udp.port", server_port+i, quake3_handle);
 		for (i=0;i<4;i++)
-			dissector_delete("udp.port", master_port+i, quake3_handle);
+			dissector_delete_uint("udp.port", master_port+i, quake3_handle);
 	}
 
         /* set port for future deletes */
@@ -627,10 +627,10 @@ proto_reg_handoff_quake3(void)
 
 	/* add dissectors */
 	for (i=0;i<4;i++)
-		dissector_add("udp.port", gbl_quake3_server_port + i,
+		dissector_add_uint("udp.port", gbl_quake3_server_port + i,
 			quake3_handle);
 	for (i=0;i<4;i++)
-		dissector_add("udp.port", gbl_quake3_master_port + i,
+		dissector_add_uint("udp.port", gbl_quake3_master_port + i,
 			quake3_handle);
 }
 
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index b50a944867..aa705d0585 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -865,12 +865,12 @@ proto_reg_handoff_quakeworld(void)
 		data_handle = find_dissector("data");
 		Initialized=TRUE;
 	} else {
-		dissector_delete("udp.port", ServerPort, quakeworld_handle);
+		dissector_delete_uint("udp.port", ServerPort, quakeworld_handle);
 	}
 
         /* set port for future deletes */
         ServerPort=gbl_quakeworldServerPort;
 
-	dissector_add("udp.port", gbl_quakeworldServerPort, quakeworld_handle);
+	dissector_add_uint("udp.port", gbl_quakeworldServerPort, quakeworld_handle);
 }
 
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index 8aca97cbc4..8ab093d5a0 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -1494,7 +1494,7 @@ void proto_reg_handoff_radiotap(void)
 
 	radiotap_handle = find_dissector("radiotap");
 
-	dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
 		      radiotap_handle);
 }
 
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index a89aeca1bb..0fc6b5809f 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -2003,22 +2003,22 @@ proto_reg_handoff_radius(void)
 
 	if (!initialized) {
 		radius_handle = find_dissector("radius");
-		dissector_add("udp.port", UDP_PORT_RADIUS, radius_handle);
-		dissector_add("udp.port", UDP_PORT_RADIUS_NEW, radius_handle);
-		dissector_add("udp.port", UDP_PORT_RADACCT, radius_handle);
-		dissector_add("udp.port", UDP_PORT_RADACCT_NEW, radius_handle);
-		dissector_add("udp.port", UDP_PORT_DAE, radius_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RADIUS, radius_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RADIUS_NEW, radius_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RADACCT, radius_handle);
+		dissector_add_uint("udp.port", UDP_PORT_RADACCT_NEW, radius_handle);
+		dissector_add_uint("udp.port", UDP_PORT_DAE, radius_handle);
 
 		eap_handle = find_dissector("eap");
 
 		initialized = TRUE;
 	} else {
 		if (alt_port != 0)
-			dissector_delete("udp.port", alt_port, radius_handle);
+			dissector_delete_uint("udp.port", alt_port, radius_handle);
 	}
 
 	if (alt_port_pref != 0)
-		dissector_add("udp.port", alt_port_pref, radius_handle);
+		dissector_add_uint("udp.port", alt_port_pref, radius_handle);
 
 	alt_port = alt_port_pref;
 }
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 4a4cfca54c..e76b6eb3cd 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -5030,7 +5030,7 @@ dissect_ranap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
                                        NO_BOUND, NO_BOUND, FALSE, &l3_info_tvb);
 
 	if (l3_info_tvb)
-		dissector_try_port(nas_pdu_dissector_table, 0x1, l3_info_tvb, actx->pinfo, proto_tree_get_root(tree));
+		dissector_try_uint(nas_pdu_dissector_table, 0x1, l3_info_tvb, actx->pinfo, proto_tree_get_root(tree));
 
 
   return offset;
@@ -5203,7 +5203,7 @@ dissect_ranap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 
 	if (nas_pdu_tvb)
-		dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, actx->pinfo, proto_tree_get_root(tree));
+		dissector_try_uint(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, actx->pinfo, proto_tree_get_root(tree));
 
 
   return offset;
@@ -11925,16 +11925,16 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 	  case id_RelocationPreparation:
 		  if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){
 			  key = SPECIAL | ProtocolIE_ID;
-			  ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+			  ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 			  break;
 		  }
 		  /* Fall trough */
 	  default:
 		  /* no special handling */
-		  ret = (dissector_try_port_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+		  ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 		  if (ret == 0) {
 			  key = pdu_type | ProtocolIE_ID;
-			  ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+			  ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 		  }
 		  break;
   }
@@ -11943,41 +11943,41 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = IMSG;
-  return (dissector_try_port_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = SOUT;
-  return (dissector_try_port_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -14977,328 +14977,328 @@ proto_reg_handoff_ranap(void)
 
 /*--- Included file: packet-ranap-dis-tab.c ---*/
 #line 1 "packet-ranap-dis-tab.c"
-  dissector_add("ranap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataVolumeReportList, new_create_dissector_handle(dissect_RAB_DataVolumeReportList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleasedList_IuRelComp, new_create_dissector_handle(dissect_RAB_ReleasedList_IuRelComp_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataVolumeReportItem, new_create_dissector_handle(dissect_RAB_DataVolumeReportItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleasedItem_IuRelComp, new_create_dissector_handle(dissect_RAB_ReleasedItem_IuRelComp_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RelocationType, new_create_dissector_handle(dissect_RelocationType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_SourceID, new_create_dissector_handle(dissect_SourceID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.ies", SPECIAL|id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TargetID, new_create_dissector_handle(dissect_TargetID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_TargetRNC_ToSourceRNC_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.ies", SPECIAL|id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_ClassmarkInformation2, new_create_dissector_handle(dissect_ClassmarkInformation2_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_ClassmarkInformation3, new_create_dissector_handle(dissect_ClassmarkInformation3_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_OldBSS_ToNewBSS_Information, new_create_dissector_handle(dissect_OldBSS_ToNewBSS_Information_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_L3_Information, new_create_dissector_handle(dissect_L3_Information_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_RelocationReleaseList, new_create_dissector_handle(dissect_RAB_RelocationReleaseList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataForwardingList, new_create_dissector_handle(dissect_RAB_DataForwardingList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_RelocationReleaseItem, new_create_dissector_handle(dissect_RAB_RelocationReleaseItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataForwardingItem, new_create_dissector_handle(dissect_RAB_DataForwardingItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_PermanentNAS_UE_ID, new_create_dissector_handle(dissect_PermanentNAS_UE_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_RelocReq, new_create_dissector_handle(dissect_RAB_SetupList_RelocReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_IntegrityProtectionInformation, new_create_dissector_handle(dissect_IntegrityProtectionInformation_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_EncryptionInformation, new_create_dissector_handle(dissect_EncryptionInformation_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_IuSigConId, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_DirectTransferInformationList_RANAP_RelocInf, new_create_dissector_handle(dissect_DirectTransferInformationList_RANAP_RelocInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_DirectTransferInformationItem_RANAP_RelocInf, new_create_dissector_handle(dissect_DirectTransferInformationItem_RANAP_RelocInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_RelocReq, new_create_dissector_handle(dissect_RAB_SetupItem_RelocReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_RelocReqAck, new_create_dissector_handle(dissect_RAB_SetupList_RelocReqAck_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedList, new_create_dissector_handle(dissect_RAB_FailedList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_ChosenIntegrityProtectionAlgorithm, new_create_dissector_handle(dissect_ChosenIntegrityProtectionAlgorithm_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_ChosenEncryptionAlgorithm, new_create_dissector_handle(dissect_ChosenEncryptionAlgorithm_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_RelocReqAck, new_create_dissector_handle(dissect_RAB_SetupItem_RelocReqAck_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedItem, new_create_dissector_handle(dissect_RAB_FailedItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataForwardingList_SRNS_CtxReq, new_create_dissector_handle(dissect_RAB_DataForwardingList_SRNS_CtxReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataForwardingItem_SRNS_CtxReq, new_create_dissector_handle(dissect_RAB_DataForwardingItem_SRNS_CtxReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextList, new_create_dissector_handle(dissect_RAB_ContextList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextFailedtoTransferList, new_create_dissector_handle(dissect_RAB_ContextFailedtoTransferList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextItem, new_create_dissector_handle(dissect_RAB_ContextItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextFailedtoTransferItem, new_create_dissector_handle(dissect_RABs_ContextFailedtoTransferItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_KeyStatus, new_create_dissector_handle(dissect_KeyStatus_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataVolumeReportRequestList, new_create_dissector_handle(dissect_RAB_DataVolumeReportRequestList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_DataVolumeReportRequestItem, new_create_dissector_handle(dissect_RAB_DataVolumeReportRequestItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedtoReportList, new_create_dissector_handle(dissect_RAB_FailedtoReportList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedtoReportItem, new_create_dissector_handle(dissect_RABs_failed_to_reportItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_GlobalRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", IMSG|id_IuSigConIdList, new_create_dissector_handle(dissect_ResetResourceList_PDU, proto_ranap));
-  dissector_add("ranap.ies", IMSG|id_IuSigConIdItem, new_create_dissector_handle(dissect_ResetResourceItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", SOUT|id_IuSigConIdList, new_create_dissector_handle(dissect_ResetResourceAckList_PDU, proto_ranap));
-  dissector_add("ranap.ies", SOUT|id_IuSigConIdItem, new_create_dissector_handle(dissect_ResetResourceAckItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleaseList, new_create_dissector_handle(dissect_RAB_ReleaseList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleaseItem, new_create_dissector_handle(dissect_RAB_ReleaseItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TemporaryUE_ID, new_create_dissector_handle(dissect_TemporaryUE_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_PagingAreaID, new_create_dissector_handle(dissect_PagingAreaID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_PagingCause, new_create_dissector_handle(dissect_PagingCause_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_NonSearchingIndication, new_create_dissector_handle(dissect_NonSearchingIndication_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_DRX_CycleLengthCoefficient, new_create_dissector_handle(dissect_DRX_CycleLengthCoefficient_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TraceType, new_create_dissector_handle(dissect_TraceType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TraceReference, new_create_dissector_handle(dissect_TraceReference_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TriggerID, new_create_dissector_handle(dissect_TriggerID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_UE_ID, new_create_dissector_handle(dissect_UE_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_OMC_ID, new_create_dissector_handle(dissect_OMC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_AreaIdentity, new_create_dissector_handle(dissect_AreaIdentity_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_LAI, new_create_dissector_handle(dissect_LAI_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_SAI, new_create_dissector_handle(dissect_SAI_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_NAS_PDU, new_create_dissector_handle(dissect_NAS_PDU_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_SAPI, new_create_dissector_handle(dissect_SAPI_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RejectCauseValue, new_create_dissector_handle(dissect_RejectCauseValue_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_NAS_SequenceNumber, new_create_dissector_handle(dissect_NAS_SequenceNumber_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_NumberOfSteps, new_create_dissector_handle(dissect_NumberOfSteps_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupOrModifyList, new_create_dissector_handle(dissect_RAB_SetupOrModifyList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupOrModifiedList, new_create_dissector_handle(dissect_RAB_SetupOrModifiedList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleasedList, new_create_dissector_handle(dissect_RAB_ReleasedList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_QueuedList, new_create_dissector_handle(dissect_RAB_QueuedList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleaseFailedList, new_create_dissector_handle(dissect_RAB_ReleaseFailedList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupOrModifiedItem, new_create_dissector_handle(dissect_RAB_SetupOrModifiedItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ReleasedItem, new_create_dissector_handle(dissect_RAB_ReleasedItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_QueuedItem, new_create_dissector_handle(dissect_RAB_QueuedItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item, new_create_dissector_handle(dissect_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextList_RANAP_RelocInf, new_create_dissector_handle(dissect_RAB_ContextList_RANAP_RelocInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ContextItem_RANAP_RelocInf, new_create_dissector_handle(dissect_RAB_ContextItem_RANAP_RelocInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ModifyList, new_create_dissector_handle(dissect_RAB_ModifyList_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ModifyItem, new_create_dissector_handle(dissect_RAB_ModifyItem_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_LocationRelatedDataRequestType, new_create_dissector_handle(dissect_LocationRelatedDataRequestType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_BroadcastAssistanceDataDecipheringKeys, new_create_dissector_handle(dissect_BroadcastAssistanceDataDecipheringKeys_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationTransferID, new_create_dissector_handle(dissect_InformationTransferID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_ProvidedData, new_create_dissector_handle(dissect_ProvidedData_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_GlobalCN_ID, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_UESBI_Iu, new_create_dissector_handle(dissect_UESBI_Iu_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InterSystemInformationTransferType, new_create_dissector_handle(dissect_InterSystemInformationTransferType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationExchangeType, new_create_dissector_handle(dissect_InformationExchangeType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationTransferType, new_create_dissector_handle(dissect_InformationTransferType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationRequestType, new_create_dissector_handle(dissect_InformationRequestType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_InformationRequested, new_create_dissector_handle(dissect_InformationRequested_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TMGI, new_create_dissector_handle(dissect_TMGI_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSSessionIdentity, new_create_dissector_handle(dissect_MBMSSessionIdentity_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSBearerServiceType, new_create_dissector_handle(dissect_MBMSBearerServiceType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_Parameters, new_create_dissector_handle(dissect_RAB_Parameters_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_PDP_TypeInformation, new_create_dissector_handle(dissect_PDP_TypeInformation_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSSessionDuration, new_create_dissector_handle(dissect_MBMSSessionDuration_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSServiceArea, new_create_dissector_handle(dissect_MBMSServiceArea_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_FrequenceLayerConvergenceFlag, new_create_dissector_handle(dissect_FrequenceLayerConvergenceFlag_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAListofIdleModeUEs, new_create_dissector_handle(dissect_RAListofIdleModeUEs_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSSessionRepetitionNumber, new_create_dissector_handle(dissect_MBMSSessionRepetitionNumber_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TimeToMBMSDataTransfer, new_create_dissector_handle(dissect_TimeToMBMSDataTransfer_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_TransportLayerInformation, new_create_dissector_handle(dissect_TransportLayerInformation_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_SessionUpdateID, new_create_dissector_handle(dissect_SessionUpdateID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_DeltaRAListofIdleModeUEs, new_create_dissector_handle(dissect_DeltaRAListofIdleModeUEs_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSCNDe_Registration, new_create_dissector_handle(dissect_MBMSCNDe_Registration_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_JoinedMBMSBearerServicesList, new_create_dissector_handle(dissect_JoinedMBMSBearerService_IEs_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_LeftMBMSBearerServicesList, new_create_dissector_handle(dissect_LeftMBMSBearerService_IEs_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_UnsuccessfulLinkingList, new_create_dissector_handle(dissect_UnsuccessfulLinking_IEs_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_MBMSRegistrationRequestType, new_create_dissector_handle(dissect_MBMSRegistrationRequestType_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_IPMulticastAddress, new_create_dissector_handle(dissect_IPMulticastAddress_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_APN, new_create_dissector_handle(dissect_APN_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_EnhancedRelocCompleteReq, new_create_dissector_handle(dissect_RAB_SetupList_EnhancedRelocCompleteReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_EnhancedRelocCompleteReq, new_create_dissector_handle(dissect_RAB_SetupItem_EnhancedRelocCompleteReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_SetupList_EnhancedRelocCompleteRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_SetupItem_EnhancedRelocCompleteRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_EnhRelocInfoReq, new_create_dissector_handle(dissect_RAB_SetupList_EnhRelocInfoReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_EnhRelocInfoReq, new_create_dissector_handle(dissect_RAB_SetupItem_EnhRelocInfoReq_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupList_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_SetupList_EnhRelocInfoRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_SetupItem_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_SetupItem_EnhRelocInfoRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_OldIuSigConId, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedList_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_FailedList_EnhRelocInfoRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_FailedItem_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_FailedItem_EnhRelocInfoRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_OldIuSigConIdCS, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_OldIuSigConIdPS, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_GlobalCN_IDCS, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_RAB_ToBeReleasedList_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_ToBeReleasedList_EnhancedRelocCompleteRes_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Relocation_TargetRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Relocation_TargetExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Alt_RAB_Parameter_SupportedMaxBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_SupportedMaxBitrateInf_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Relocation_SourceRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_Relocation_SourceExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_EncryptionKey, new_create_dissector_handle(dissect_EncryptionKey_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_IntegrityProtectionKey, new_create_dissector_handle(dissect_IntegrityProtectionKey_PDU, proto_ranap));
-  dissector_add("ranap.ies", id_SRVCC_Information, new_create_dissector_handle(dissect_SRVCC_Information_PDU, proto_ranap));
-  dissector_add("ranap.ies.pair.first", id_RAB_SetupOrModifyItem, new_create_dissector_handle(dissect_RAB_SetupOrModifyItemFirst_PDU, proto_ranap));
-  dissector_add("ranap.ies.pair.second", id_RAB_SetupOrModifyItem, new_create_dissector_handle(dissect_RAB_SetupOrModifyItemSecond_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_AlternativeRABConfiguration, new_create_dissector_handle(dissect_RAB_Parameters_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Alt_RAB_Parameter_ExtendedMaxBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_ExtendedMaxBitrateInf_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Ass_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_Ass_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_newLAListofIdleModeUEs, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_LAListwithNoIdleModeUEsAnyMore, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_GANSS_PositioningDataSet, new_create_dissector_handle(dissect_GANSS_PositioningDataSet_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SignallingIndication, new_create_dissector_handle(dissect_SignallingIndication_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_LAofIdleModeUEs, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_AlternativeRABConfigurationRequest, new_create_dissector_handle(dissect_AlternativeRABConfigurationRequest_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Requested_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_Requested_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_ExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SRB_TrCH_Mapping, new_create_dissector_handle(dissect_SRB_TrCH_Mapping_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CellLoadInformationGroup, new_create_dissector_handle(dissect_CellLoadInformationGroup_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_TraceRecordingSessionInformation, new_create_dissector_handle(dissect_TraceRecordingSessionInformation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_MBMSLinkingInformation, new_create_dissector_handle(dissect_MBMSLinkingInformation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_hS_DSCH_MAC_d_Flow_ID, new_create_dissector_handle(dissect_HS_DSCH_MAC_d_Flow_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_E_DCH_MAC_d_Flow_ID, new_create_dissector_handle(dissect_E_DCH_MAC_d_Flow_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_GERAN_Classmark, new_create_dissector_handle(dissect_GERAN_Classmark_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SourceBSS_ToTargetBSS_TransparentContainer, new_create_dissector_handle(dissect_SourceBSS_ToTargetBSS_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_IuTransportAssociation, new_create_dissector_handle(dissect_IuTransportAssociation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_InterSystemInformation_TransparentContainer, new_create_dissector_handle(dissect_InterSystemInformation_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_TargetBSS_ToSourceBSS_TransparentContainer, new_create_dissector_handle(dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Alt_RAB_Parameters, new_create_dissector_handle(dissect_Alt_RAB_Parameters_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_GERAN_BSC_Container, new_create_dissector_handle(dissect_GERAN_BSC_Container_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_GlobalCN_ID, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SNA_Access_Information, new_create_dissector_handle(dissect_SNA_Access_Information_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_UESBI_Iu, new_create_dissector_handle(dissect_UESBI_Iu_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SelectedPLMN_ID, new_create_dissector_handle(dissect_PLMNidentity_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CNMBMSLinkingInformation, new_create_dissector_handle(dissect_CNMBMSLinkingInformation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Ass_RAB_Parameters, new_create_dissector_handle(dissect_Ass_RAB_Parameters_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_NewBSS_To_OldBSS_Information, new_create_dissector_handle(dissect_NewBSS_To_OldBSS_Information_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAT_Type, new_create_dissector_handle(dissect_RAT_Type_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_TracePropagationParameters, new_create_dissector_handle(dissect_TracePropagationParameters_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_VerticalAccuracyCode, new_create_dissector_handle(dissect_VerticalAccuracyCode_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_ResponseTime, new_create_dissector_handle(dissect_ResponseTime_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PositioningPriority, new_create_dissector_handle(dissect_PositioningPriority_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_ClientType, new_create_dissector_handle(dissect_ClientType_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_IncludeVelocity, new_create_dissector_handle(dissect_IncludeVelocity_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_LastKnownServiceArea, new_create_dissector_handle(dissect_LastKnownServiceArea_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PositionData, new_create_dissector_handle(dissect_PositionData_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PositionDataSpecificToGERANIuMode, new_create_dissector_handle(dissect_PositionDataSpecificToGERANIuMode_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_AccuracyFulfilmentIndicator, new_create_dissector_handle(dissect_AccuracyFulfilmentIndicator_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_VelocityEstimate, new_create_dissector_handle(dissect_VelocityEstimate_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PermanentNAS_UE_ID, new_create_dissector_handle(dissect_PermanentNAS_UE_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_NAS_SequenceNumber, new_create_dissector_handle(dissect_NAS_SequenceNumber_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RedirectAttemptFlag, new_create_dissector_handle(dissect_RedirectAttemptFlag_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RedirectionIndication, new_create_dissector_handle(dissect_RedirectionIndication_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RedirectionCompleted, new_create_dissector_handle(dissect_RedirectionCompleted_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SourceRNC_PDCP_context_info, new_create_dissector_handle(dissect_RRC_Container_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_GERAN_Iumode_RAB_FailedList_RABAssgntResponse, new_create_dissector_handle(dissect_GERAN_Iumode_RAB_FailedList_RABAssgntResponse_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_LocationRelatedDataRequestTypeSpecificToGERANIuMode, new_create_dissector_handle(dissect_LocationRelatedDataRequestTypeSpecificToGERANIuMode_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RequestedGANSSAssistanceData, new_create_dissector_handle(dissect_RequestedGANSSAssistanceData_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_MBMSCountingInformation, new_create_dissector_handle(dissect_MBMSCountingInformation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_UE_History_Information, new_create_dissector_handle(dissect_UE_History_Information_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_MBMSSynchronisationInformation, new_create_dissector_handle(dissect_MBMSSynchronisationInformation_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SubscriberProfileIDforRFP, new_create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Ass_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Ass_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Requested_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Requested_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SRVCC_HO_Indication, new_create_dissector_handle(dissect_SRVCC_HO_Indication_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_SRVCC_Operation_Possible, new_create_dissector_handle(dissect_SRVCC_Operation_Possible_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CSG_Id_List, new_create_dissector_handle(dissect_CSG_Id_List_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PSRABtobeReplaced, new_create_dissector_handle(dissect_RAB_ID_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_E_UTRAN_Service_Handover, new_create_dissector_handle(dissect_E_UTRAN_Service_Handover_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CSG_Membership_Status, new_create_dissector_handle(dissect_CSG_Membership_Status_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_Cell_Access_Mode, new_create_dissector_handle(dissect_Cell_Access_Mode_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_IP_Source_Address, new_create_dissector_handle(dissect_IPMulticastAddress_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_CSFB_Information, new_create_dissector_handle(dissect_CSFB_Information_PDU, proto_ranap));
-  dissector_add("ranap.extension", id_PDP_TypeInformation_extension, new_create_dissector_handle(dissect_PDP_TypeInformation_extension_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseCommand_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseComplete_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationRequired_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationCommand_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationPreparationFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationRequestAcknowledge_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RelocationCancel, new_create_dissector_handle(dissect_RelocationCancel_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_RelocationCancel, new_create_dissector_handle(dissect_RelocationCancelAcknowledge_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_SRNS_ContextTransfer, new_create_dissector_handle(dissect_SRNS_ContextRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_SRNS_ContextTransfer, new_create_dissector_handle(dissect_SRNS_ContextResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeCommand_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeComplete_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeReject_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_DataVolumeReport, new_create_dissector_handle(dissect_DataVolumeReportRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_DataVolumeReport, new_create_dissector_handle(dissect_DataVolumeReport_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_Reset, new_create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RAB_ReleaseRequest, new_create_dissector_handle(dissect_RAB_ReleaseRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_Iu_ReleaseRequest, new_create_dissector_handle(dissect_Iu_ReleaseRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RelocationDetect, new_create_dissector_handle(dissect_RelocationDetect_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RelocationComplete, new_create_dissector_handle(dissect_RelocationComplete_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_Paging, new_create_dissector_handle(dissect_Paging_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_CommonID, new_create_dissector_handle(dissect_CommonID_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_CN_InvokeTrace, new_create_dissector_handle(dissect_CN_InvokeTrace_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_CN_DeactivateTrace, new_create_dissector_handle(dissect_CN_DeactivateTrace_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_LocationReportingControl, new_create_dissector_handle(dissect_LocationReportingControl_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_LocationReport, new_create_dissector_handle(dissect_LocationReport_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_InitialUE_Message, new_create_dissector_handle(dissect_InitialUE_Message_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_DirectTransfer, new_create_dissector_handle(dissect_DirectTransfer_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_OverloadControl, new_create_dissector_handle(dissect_Overload_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_SRNS_DataForward, new_create_dissector_handle(dissect_SRNS_DataForwardCommand_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_ForwardSRNS_Context, new_create_dissector_handle(dissect_ForwardSRNS_Context_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RAB_Assignment, new_create_dissector_handle(dissect_RAB_AssignmentRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.out", id_RAB_Assignment, new_create_dissector_handle(dissect_RAB_AssignmentResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_ResetResource, new_create_dissector_handle(dissect_ResetResource_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_ResetResource, new_create_dissector_handle(dissect_ResetResourceAcknowledge_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RANAP_Relocation, new_create_dissector_handle(dissect_RANAP_RelocationInformation_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RAB_ModifyRequest, new_create_dissector_handle(dissect_RAB_ModifyRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferIndication_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferConfirmation_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_UESpecificInformation, new_create_dissector_handle(dissect_UESpecificInformationIndication_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_DirectInformationTransfer, new_create_dissector_handle(dissect_DirectInformationTransfer_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStart_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStartResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStartFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdate_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdateResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdateFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSSessionStop, new_create_dissector_handle(dissect_MBMSSessionStop_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSSessionStop, new_create_dissector_handle(dissect_MBMSSessionStopResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSUELinking, new_create_dissector_handle(dissect_MBMSUELinkingRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.out", id_MBMSUELinking, new_create_dissector_handle(dissect_MBMSUELinkingResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSCNDe_Registration_Procedure, new_create_dissector_handle(dissect_MBMSCNDe_RegistrationRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSCNDe_Registration_Procedure, new_create_dissector_handle(dissect_MBMSCNDe_RegistrationResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSRABEstablishmentIndication, new_create_dissector_handle(dissect_MBMSRABEstablishmentIndication_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABReleaseRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABRelease_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABReleaseFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.uout", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteFailure_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_enhancedRelocationCompleteConfirm, new_create_dissector_handle(dissect_EnhancedRelocationCompleteConfirm_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_RANAPenhancedRelocation, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.sout", id_RANAPenhancedRelocation, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationResponse_PDU, proto_ranap));
-  dissector_add("ranap.proc.imsg", id_SRVCCPreparation, new_create_dissector_handle(dissect_SRVCC_CSKeysRequest_PDU, proto_ranap));
-  dissector_add("ranap.proc.out", id_SRVCCPreparation, new_create_dissector_handle(dissect_SRVCC_CSKeysResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportList, new_create_dissector_handle(dissect_RAB_DataVolumeReportList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleasedList_IuRelComp, new_create_dissector_handle(dissect_RAB_ReleasedList_IuRelComp_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportItem, new_create_dissector_handle(dissect_RAB_DataVolumeReportItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleasedItem_IuRelComp, new_create_dissector_handle(dissect_RAB_ReleasedItem_IuRelComp_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RelocationType, new_create_dissector_handle(dissect_RelocationType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_SourceID, new_create_dissector_handle(dissect_SourceID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", SPECIAL|id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TargetID, new_create_dissector_handle(dissect_TargetID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_TargetRNC_ToSourceRNC_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", SPECIAL|id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_ClassmarkInformation2, new_create_dissector_handle(dissect_ClassmarkInformation2_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_ClassmarkInformation3, new_create_dissector_handle(dissect_ClassmarkInformation3_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_OldBSS_ToNewBSS_Information, new_create_dissector_handle(dissect_OldBSS_ToNewBSS_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_L3_Information, new_create_dissector_handle(dissect_L3_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_RelocationReleaseList, new_create_dissector_handle(dissect_RAB_RelocationReleaseList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataForwardingList, new_create_dissector_handle(dissect_RAB_DataForwardingList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_RelocationReleaseItem, new_create_dissector_handle(dissect_RAB_RelocationReleaseItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataForwardingItem, new_create_dissector_handle(dissect_RAB_DataForwardingItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_PermanentNAS_UE_ID, new_create_dissector_handle(dissect_PermanentNAS_UE_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_RelocReq, new_create_dissector_handle(dissect_RAB_SetupList_RelocReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_IntegrityProtectionInformation, new_create_dissector_handle(dissect_IntegrityProtectionInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_EncryptionInformation, new_create_dissector_handle(dissect_EncryptionInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_IuSigConId, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_DirectTransferInformationList_RANAP_RelocInf, new_create_dissector_handle(dissect_DirectTransferInformationList_RANAP_RelocInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_DirectTransferInformationItem_RANAP_RelocInf, new_create_dissector_handle(dissect_DirectTransferInformationItem_RANAP_RelocInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_RelocReq, new_create_dissector_handle(dissect_RAB_SetupItem_RelocReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_RelocReqAck, new_create_dissector_handle(dissect_RAB_SetupList_RelocReqAck_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedList, new_create_dissector_handle(dissect_RAB_FailedList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_ChosenIntegrityProtectionAlgorithm, new_create_dissector_handle(dissect_ChosenIntegrityProtectionAlgorithm_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_ChosenEncryptionAlgorithm, new_create_dissector_handle(dissect_ChosenEncryptionAlgorithm_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_RelocReqAck, new_create_dissector_handle(dissect_RAB_SetupItem_RelocReqAck_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedItem, new_create_dissector_handle(dissect_RAB_FailedItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataForwardingList_SRNS_CtxReq, new_create_dissector_handle(dissect_RAB_DataForwardingList_SRNS_CtxReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataForwardingItem_SRNS_CtxReq, new_create_dissector_handle(dissect_RAB_DataForwardingItem_SRNS_CtxReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextList, new_create_dissector_handle(dissect_RAB_ContextList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextFailedtoTransferList, new_create_dissector_handle(dissect_RAB_ContextFailedtoTransferList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextItem, new_create_dissector_handle(dissect_RAB_ContextItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextFailedtoTransferItem, new_create_dissector_handle(dissect_RABs_ContextFailedtoTransferItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_KeyStatus, new_create_dissector_handle(dissect_KeyStatus_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportRequestList, new_create_dissector_handle(dissect_RAB_DataVolumeReportRequestList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportRequestItem, new_create_dissector_handle(dissect_RAB_DataVolumeReportRequestItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedtoReportList, new_create_dissector_handle(dissect_RAB_FailedtoReportList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedtoReportItem, new_create_dissector_handle(dissect_RABs_failed_to_reportItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_GlobalRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", IMSG|id_IuSigConIdList, new_create_dissector_handle(dissect_ResetResourceList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", IMSG|id_IuSigConIdItem, new_create_dissector_handle(dissect_ResetResourceItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", SOUT|id_IuSigConIdList, new_create_dissector_handle(dissect_ResetResourceAckList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", SOUT|id_IuSigConIdItem, new_create_dissector_handle(dissect_ResetResourceAckItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleaseList, new_create_dissector_handle(dissect_RAB_ReleaseList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleaseItem, new_create_dissector_handle(dissect_RAB_ReleaseItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TemporaryUE_ID, new_create_dissector_handle(dissect_TemporaryUE_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_PagingAreaID, new_create_dissector_handle(dissect_PagingAreaID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_PagingCause, new_create_dissector_handle(dissect_PagingCause_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_NonSearchingIndication, new_create_dissector_handle(dissect_NonSearchingIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_DRX_CycleLengthCoefficient, new_create_dissector_handle(dissect_DRX_CycleLengthCoefficient_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TraceType, new_create_dissector_handle(dissect_TraceType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TraceReference, new_create_dissector_handle(dissect_TraceReference_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TriggerID, new_create_dissector_handle(dissect_TriggerID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_UE_ID, new_create_dissector_handle(dissect_UE_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_OMC_ID, new_create_dissector_handle(dissect_OMC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_AreaIdentity, new_create_dissector_handle(dissect_AreaIdentity_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_LAI, new_create_dissector_handle(dissect_LAI_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_SAI, new_create_dissector_handle(dissect_SAI_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_NAS_PDU, new_create_dissector_handle(dissect_NAS_PDU_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_SAPI, new_create_dissector_handle(dissect_SAPI_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RejectCauseValue, new_create_dissector_handle(dissect_RejectCauseValue_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_NAS_SequenceNumber, new_create_dissector_handle(dissect_NAS_SequenceNumber_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_NumberOfSteps, new_create_dissector_handle(dissect_NumberOfSteps_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupOrModifyList, new_create_dissector_handle(dissect_RAB_SetupOrModifyList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupOrModifiedList, new_create_dissector_handle(dissect_RAB_SetupOrModifiedList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleasedList, new_create_dissector_handle(dissect_RAB_ReleasedList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_QueuedList, new_create_dissector_handle(dissect_RAB_QueuedList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleaseFailedList, new_create_dissector_handle(dissect_RAB_ReleaseFailedList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupOrModifiedItem, new_create_dissector_handle(dissect_RAB_SetupOrModifiedItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ReleasedItem, new_create_dissector_handle(dissect_RAB_ReleasedItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_QueuedItem, new_create_dissector_handle(dissect_RAB_QueuedItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item, new_create_dissector_handle(dissect_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextList_RANAP_RelocInf, new_create_dissector_handle(dissect_RAB_ContextList_RANAP_RelocInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ContextItem_RANAP_RelocInf, new_create_dissector_handle(dissect_RAB_ContextItem_RANAP_RelocInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ModifyList, new_create_dissector_handle(dissect_RAB_ModifyList_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ModifyItem, new_create_dissector_handle(dissect_RAB_ModifyItem_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_LocationRelatedDataRequestType, new_create_dissector_handle(dissect_LocationRelatedDataRequestType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_BroadcastAssistanceDataDecipheringKeys, new_create_dissector_handle(dissect_BroadcastAssistanceDataDecipheringKeys_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationTransferID, new_create_dissector_handle(dissect_InformationTransferID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_ProvidedData, new_create_dissector_handle(dissect_ProvidedData_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_GlobalCN_ID, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_UESBI_Iu, new_create_dissector_handle(dissect_UESBI_Iu_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InterSystemInformationTransferType, new_create_dissector_handle(dissect_InterSystemInformationTransferType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationExchangeType, new_create_dissector_handle(dissect_InformationExchangeType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationTransferType, new_create_dissector_handle(dissect_InformationTransferType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationRequestType, new_create_dissector_handle(dissect_InformationRequestType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_InformationRequested, new_create_dissector_handle(dissect_InformationRequested_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TMGI, new_create_dissector_handle(dissect_TMGI_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSSessionIdentity, new_create_dissector_handle(dissect_MBMSSessionIdentity_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSBearerServiceType, new_create_dissector_handle(dissect_MBMSBearerServiceType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_Parameters, new_create_dissector_handle(dissect_RAB_Parameters_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_PDP_TypeInformation, new_create_dissector_handle(dissect_PDP_TypeInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSSessionDuration, new_create_dissector_handle(dissect_MBMSSessionDuration_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSServiceArea, new_create_dissector_handle(dissect_MBMSServiceArea_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_FrequenceLayerConvergenceFlag, new_create_dissector_handle(dissect_FrequenceLayerConvergenceFlag_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAListofIdleModeUEs, new_create_dissector_handle(dissect_RAListofIdleModeUEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSSessionRepetitionNumber, new_create_dissector_handle(dissect_MBMSSessionRepetitionNumber_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TimeToMBMSDataTransfer, new_create_dissector_handle(dissect_TimeToMBMSDataTransfer_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_TransportLayerInformation, new_create_dissector_handle(dissect_TransportLayerInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_SessionUpdateID, new_create_dissector_handle(dissect_SessionUpdateID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_DeltaRAListofIdleModeUEs, new_create_dissector_handle(dissect_DeltaRAListofIdleModeUEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSCNDe_Registration, new_create_dissector_handle(dissect_MBMSCNDe_Registration_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_JoinedMBMSBearerServicesList, new_create_dissector_handle(dissect_JoinedMBMSBearerService_IEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_LeftMBMSBearerServicesList, new_create_dissector_handle(dissect_LeftMBMSBearerService_IEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_UnsuccessfulLinkingList, new_create_dissector_handle(dissect_UnsuccessfulLinking_IEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_MBMSRegistrationRequestType, new_create_dissector_handle(dissect_MBMSRegistrationRequestType_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_IPMulticastAddress, new_create_dissector_handle(dissect_IPMulticastAddress_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_APN, new_create_dissector_handle(dissect_APN_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_EnhancedRelocCompleteReq, new_create_dissector_handle(dissect_RAB_SetupList_EnhancedRelocCompleteReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_EnhancedRelocCompleteReq, new_create_dissector_handle(dissect_RAB_SetupItem_EnhancedRelocCompleteReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_SetupList_EnhancedRelocCompleteRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_SetupItem_EnhancedRelocCompleteRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_EnhRelocInfoReq, new_create_dissector_handle(dissect_RAB_SetupList_EnhRelocInfoReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_EnhRelocInfoReq, new_create_dissector_handle(dissect_RAB_SetupItem_EnhRelocInfoReq_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupList_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_SetupList_EnhRelocInfoRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_SetupItem_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_SetupItem_EnhRelocInfoRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_OldIuSigConId, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedList_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_FailedList_EnhRelocInfoRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_FailedItem_EnhRelocInfoRes, new_create_dissector_handle(dissect_RAB_FailedItem_EnhRelocInfoRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_OldIuSigConIdCS, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_OldIuSigConIdPS, new_create_dissector_handle(dissect_IuSignallingConnectionIdentifier_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_GlobalCN_IDCS, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_RAB_ToBeReleasedList_EnhancedRelocCompleteRes, new_create_dissector_handle(dissect_RAB_ToBeReleasedList_EnhancedRelocCompleteRes_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Relocation_TargetRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Relocation_TargetExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Alt_RAB_Parameter_SupportedMaxBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_SupportedMaxBitrateInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Relocation_SourceRNC_ID, new_create_dissector_handle(dissect_GlobalRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_Relocation_SourceExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_EncryptionKey, new_create_dissector_handle(dissect_EncryptionKey_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_IntegrityProtectionKey, new_create_dissector_handle(dissect_IntegrityProtectionKey_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies", id_SRVCC_Information, new_create_dissector_handle(dissect_SRVCC_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies.pair.first", id_RAB_SetupOrModifyItem, new_create_dissector_handle(dissect_RAB_SetupOrModifyItemFirst_PDU, proto_ranap));
+  dissector_add_uint("ranap.ies.pair.second", id_RAB_SetupOrModifyItem, new_create_dissector_handle(dissect_RAB_SetupOrModifyItemSecond_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_AlternativeRABConfiguration, new_create_dissector_handle(dissect_RAB_Parameters_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Alt_RAB_Parameter_ExtendedMaxBitrateInf, new_create_dissector_handle(dissect_Alt_RAB_Parameter_ExtendedMaxBitrateInf_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_Ass_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAC, new_create_dissector_handle(dissect_RAC_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_newLAListofIdleModeUEs, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_LAListwithNoIdleModeUEsAnyMore, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_GANSS_PositioningDataSet, new_create_dissector_handle(dissect_GANSS_PositioningDataSet_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SignallingIndication, new_create_dissector_handle(dissect_SignallingIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_LAofIdleModeUEs, new_create_dissector_handle(dissect_LAListofIdleModeUEs_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_AlternativeRABConfigurationRequest, new_create_dissector_handle(dissect_AlternativeRABConfigurationRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Requested_RAB_Parameter_ExtendedMaxBitrateList, new_create_dissector_handle(dissect_Requested_RAB_Parameter_ExtendedMaxBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList, new_create_dissector_handle(dissect_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_ExtendedRNC_ID, new_create_dissector_handle(dissect_ExtendedRNC_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SRB_TrCH_Mapping, new_create_dissector_handle(dissect_SRB_TrCH_Mapping_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CellLoadInformationGroup, new_create_dissector_handle(dissect_CellLoadInformationGroup_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_TraceRecordingSessionInformation, new_create_dissector_handle(dissect_TraceRecordingSessionInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_MBMSLinkingInformation, new_create_dissector_handle(dissect_MBMSLinkingInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_hS_DSCH_MAC_d_Flow_ID, new_create_dissector_handle(dissect_HS_DSCH_MAC_d_Flow_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_E_DCH_MAC_d_Flow_ID, new_create_dissector_handle(dissect_E_DCH_MAC_d_Flow_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_GERAN_Classmark, new_create_dissector_handle(dissect_GERAN_Classmark_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SourceBSS_ToTargetBSS_TransparentContainer, new_create_dissector_handle(dissect_SourceBSS_ToTargetBSS_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_IuTransportAssociation, new_create_dissector_handle(dissect_IuTransportAssociation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_InterSystemInformation_TransparentContainer, new_create_dissector_handle(dissect_InterSystemInformation_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_TargetBSS_ToSourceBSS_TransparentContainer, new_create_dissector_handle(dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Alt_RAB_Parameters, new_create_dissector_handle(dissect_Alt_RAB_Parameters_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_GERAN_BSC_Container, new_create_dissector_handle(dissect_GERAN_BSC_Container_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_GlobalCN_ID, new_create_dissector_handle(dissect_GlobalCN_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SNA_Access_Information, new_create_dissector_handle(dissect_SNA_Access_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_UESBI_Iu, new_create_dissector_handle(dissect_UESBI_Iu_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SelectedPLMN_ID, new_create_dissector_handle(dissect_PLMNidentity_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CNMBMSLinkingInformation, new_create_dissector_handle(dissect_CNMBMSLinkingInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Ass_RAB_Parameters, new_create_dissector_handle(dissect_Ass_RAB_Parameters_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_NewBSS_To_OldBSS_Information, new_create_dissector_handle(dissect_NewBSS_To_OldBSS_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAT_Type, new_create_dissector_handle(dissect_RAT_Type_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_TracePropagationParameters, new_create_dissector_handle(dissect_TracePropagationParameters_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_VerticalAccuracyCode, new_create_dissector_handle(dissect_VerticalAccuracyCode_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_ResponseTime, new_create_dissector_handle(dissect_ResponseTime_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PositioningPriority, new_create_dissector_handle(dissect_PositioningPriority_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_ClientType, new_create_dissector_handle(dissect_ClientType_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_IncludeVelocity, new_create_dissector_handle(dissect_IncludeVelocity_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_LastKnownServiceArea, new_create_dissector_handle(dissect_LastKnownServiceArea_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PositionData, new_create_dissector_handle(dissect_PositionData_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PositionDataSpecificToGERANIuMode, new_create_dissector_handle(dissect_PositionDataSpecificToGERANIuMode_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_AccuracyFulfilmentIndicator, new_create_dissector_handle(dissect_AccuracyFulfilmentIndicator_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_VelocityEstimate, new_create_dissector_handle(dissect_VelocityEstimate_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PermanentNAS_UE_ID, new_create_dissector_handle(dissect_PermanentNAS_UE_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_NAS_SequenceNumber, new_create_dissector_handle(dissect_NAS_SequenceNumber_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RedirectAttemptFlag, new_create_dissector_handle(dissect_RedirectAttemptFlag_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RedirectionIndication, new_create_dissector_handle(dissect_RedirectionIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RedirectionCompleted, new_create_dissector_handle(dissect_RedirectionCompleted_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SourceRNC_PDCP_context_info, new_create_dissector_handle(dissect_RRC_Container_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_GERAN_Iumode_RAB_FailedList_RABAssgntResponse, new_create_dissector_handle(dissect_GERAN_Iumode_RAB_FailedList_RABAssgntResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_LocationRelatedDataRequestTypeSpecificToGERANIuMode, new_create_dissector_handle(dissect_LocationRelatedDataRequestTypeSpecificToGERANIuMode_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RequestedGANSSAssistanceData, new_create_dissector_handle(dissect_RequestedGANSSAssistanceData_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_MBMSCountingInformation, new_create_dissector_handle(dissect_MBMSCountingInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_UE_History_Information, new_create_dissector_handle(dissect_UE_History_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_MBMSSynchronisationInformation, new_create_dissector_handle(dissect_MBMSSynchronisationInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SubscriberProfileIDforRFP, new_create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Ass_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Requested_RAB_Parameter_SupportedMaxBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Requested_RAB_Parameter_SupportedGuaranteedBitrateList, new_create_dissector_handle(dissect_SupportedRAB_ParameterBitrateList_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SRVCC_HO_Indication, new_create_dissector_handle(dissect_SRVCC_HO_Indication_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_SRVCC_Operation_Possible, new_create_dissector_handle(dissect_SRVCC_Operation_Possible_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CSG_Id_List, new_create_dissector_handle(dissect_CSG_Id_List_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PSRABtobeReplaced, new_create_dissector_handle(dissect_RAB_ID_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_E_UTRAN_Service_Handover, new_create_dissector_handle(dissect_E_UTRAN_Service_Handover_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CSG_Membership_Status, new_create_dissector_handle(dissect_CSG_Membership_Status_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_Cell_Access_Mode, new_create_dissector_handle(dissect_Cell_Access_Mode_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_IP_Source_Address, new_create_dissector_handle(dissect_IPMulticastAddress_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_CSFB_Information, new_create_dissector_handle(dissect_CSFB_Information_PDU, proto_ranap));
+  dissector_add_uint("ranap.extension", id_PDP_TypeInformation_extension, new_create_dissector_handle(dissect_PDP_TypeInformation_extension_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseCommand_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_Iu_Release, new_create_dissector_handle(dissect_Iu_ReleaseComplete_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationRequired_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationCommand_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_RelocationPreparation, new_create_dissector_handle(dissect_RelocationPreparationFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationRequestAcknowledge_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_RelocationResourceAllocation, new_create_dissector_handle(dissect_RelocationFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RelocationCancel, new_create_dissector_handle(dissect_RelocationCancel_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_RelocationCancel, new_create_dissector_handle(dissect_RelocationCancelAcknowledge_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_SRNS_ContextTransfer, new_create_dissector_handle(dissect_SRNS_ContextRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_SRNS_ContextTransfer, new_create_dissector_handle(dissect_SRNS_ContextResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeCommand_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeComplete_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_SecurityModeControl, new_create_dissector_handle(dissect_SecurityModeReject_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_DataVolumeReport, new_create_dissector_handle(dissect_DataVolumeReportRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_DataVolumeReport, new_create_dissector_handle(dissect_DataVolumeReport_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_Reset, new_create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RAB_ReleaseRequest, new_create_dissector_handle(dissect_RAB_ReleaseRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_Iu_ReleaseRequest, new_create_dissector_handle(dissect_Iu_ReleaseRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RelocationDetect, new_create_dissector_handle(dissect_RelocationDetect_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RelocationComplete, new_create_dissector_handle(dissect_RelocationComplete_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_Paging, new_create_dissector_handle(dissect_Paging_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_CommonID, new_create_dissector_handle(dissect_CommonID_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_CN_InvokeTrace, new_create_dissector_handle(dissect_CN_InvokeTrace_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_CN_DeactivateTrace, new_create_dissector_handle(dissect_CN_DeactivateTrace_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_LocationReportingControl, new_create_dissector_handle(dissect_LocationReportingControl_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_LocationReport, new_create_dissector_handle(dissect_LocationReport_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_InitialUE_Message, new_create_dissector_handle(dissect_InitialUE_Message_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_DirectTransfer, new_create_dissector_handle(dissect_DirectTransfer_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_OverloadControl, new_create_dissector_handle(dissect_Overload_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_SRNS_DataForward, new_create_dissector_handle(dissect_SRNS_DataForwardCommand_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_ForwardSRNS_Context, new_create_dissector_handle(dissect_ForwardSRNS_Context_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RAB_Assignment, new_create_dissector_handle(dissect_RAB_AssignmentRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.out", id_RAB_Assignment, new_create_dissector_handle(dissect_RAB_AssignmentResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_ResetResource, new_create_dissector_handle(dissect_ResetResource_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_ResetResource, new_create_dissector_handle(dissect_ResetResourceAcknowledge_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RANAP_Relocation, new_create_dissector_handle(dissect_RANAP_RelocationInformation_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RAB_ModifyRequest, new_create_dissector_handle(dissect_RAB_ModifyRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_LocationRelatedData, new_create_dissector_handle(dissect_LocationRelatedDataFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferConfirmation_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_InformationTransfer, new_create_dissector_handle(dissect_InformationTransferFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_UESpecificInformation, new_create_dissector_handle(dissect_UESpecificInformationIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_DirectInformationTransfer, new_create_dissector_handle(dissect_DirectInformationTransfer_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_UplinkInformationExchange, new_create_dissector_handle(dissect_UplinkInformationExchangeFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStart_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStartResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_MBMSSessionStart, new_create_dissector_handle(dissect_MBMSSessionStartFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdate_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdateResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_MBMSSessionUpdate, new_create_dissector_handle(dissect_MBMSSessionUpdateFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSSessionStop, new_create_dissector_handle(dissect_MBMSSessionStop_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSSessionStop, new_create_dissector_handle(dissect_MBMSSessionStopResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSUELinking, new_create_dissector_handle(dissect_MBMSUELinkingRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.out", id_MBMSUELinking, new_create_dissector_handle(dissect_MBMSUELinkingResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_MBMSRegistration, new_create_dissector_handle(dissect_MBMSRegistrationFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSCNDe_Registration_Procedure, new_create_dissector_handle(dissect_MBMSCNDe_RegistrationRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSCNDe_Registration_Procedure, new_create_dissector_handle(dissect_MBMSCNDe_RegistrationResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSRABEstablishmentIndication, new_create_dissector_handle(dissect_MBMSRABEstablishmentIndication_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABReleaseRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABRelease_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_MBMSRABRelease, new_create_dissector_handle(dissect_MBMSRABReleaseFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.uout", id_enhancedRelocationComplete, new_create_dissector_handle(dissect_EnhancedRelocationCompleteFailure_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_enhancedRelocationCompleteConfirm, new_create_dissector_handle(dissect_EnhancedRelocationCompleteConfirm_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_RANAPenhancedRelocation, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.sout", id_RANAPenhancedRelocation, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationResponse_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.imsg", id_SRVCCPreparation, new_create_dissector_handle(dissect_SRVCC_CSKeysRequest_PDU, proto_ranap));
+  dissector_add_uint("ranap.proc.out", id_SRVCCPreparation, new_create_dissector_handle(dissect_SRVCC_CSKeysResponse_PDU, proto_ranap));
 
 
 /*--- End of included file: packet-ranap-dis-tab.c ---*/
 #line 351 "packet-ranap-template.c"
 	} else {
-		dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
+		dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
 	}
 
-	dissector_add("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
+	dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
 	local_ranap_sccp_ssn = global_ranap_sccp_ssn;
 	/* Add heuristic dissector
 	* Perhaps we want a preference whether the heuristic dissector
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index e575508de6..200d26202a 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -205,7 +205,7 @@ proto_reg_handoff_raw(void)
   data_handle = find_dissector("data");
   ppp_hdlc_handle = find_dissector("ppp_hdlc");
   raw_handle = create_dissector_handle(dissect_raw, proto_raw);
-  dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP, raw_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP4, raw_handle);
-  dissector_add("wtap_encap", WTAP_ENCAP_RAW_IP6, raw_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IP, raw_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IP4, raw_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IP6, raw_handle);
 }
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 0ae42cd528..c03d3d8327 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -2214,7 +2214,7 @@ void proto_reg_handoff_rdt(void)
         /* Undo any current port registrations */
         if (rdt_register_udp_port)
         {
-            dissector_delete("udp.port", rdt_udp_port, rdt_handle);
+            dissector_delete_uint("udp.port", rdt_udp_port, rdt_handle);
         }
     }
 
@@ -2228,7 +2228,7 @@ void proto_reg_handoff_rdt(void)
         rdt_udp_port = global_rdt_udp_port;
 
         /* And register with this port */
-        dissector_add("udp.port", global_rdt_udp_port, rdt_handle);
+        dissector_add_uint("udp.port", global_rdt_udp_port, rdt_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index 9721dc8d81..d0b61ea3e3 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -116,10 +116,10 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				call_dissector(ethnofcs_handle, next_tvb, pinfo, tree);
 			} else {
 				guint8 nlpid = tvb_get_guint8(tvb, dataoff);
-				if(dissector_try_port(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree))
+				if(dissector_try_uint(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree))
 					break;
 				next_tvb = tvb_new_subset_remaining(tvb, dataoff+1);
-				if(dissector_try_port(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree))
+				if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree))
 					break;
 				next_tvb = tvb_new_subset_remaining(tvb, dataoff);
 				call_dissector(data_handle, next_tvb, pinfo, tree);
@@ -221,7 +221,7 @@ proto_reg_handoff_redback(void)
 	ppphdlc_handle = find_dissector("ppp_hdlc");
 
 	redback_handle = create_dissector_handle(dissect_redback, proto_redback);
-	dissector_add("wtap_encap", WTAP_ENCAP_REDBACK, redback_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_REDBACK, redback_handle);
 }
 
 
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c
index 22ace01414..a58fbe2668 100644
--- a/epan/dissectors/packet-reload-framing.c
+++ b/epan/dissectors/packet-reload-framing.c
@@ -407,8 +407,8 @@ proto_reg_handoff_reload_framing(void)
 
   reload_handle = find_dissector("reload");
 
-  dissector_add("tcp.port", TCP_PORT_RELOAD, reload_framing_tcp_handle);
-  dissector_add("udp.port", UDP_PORT_RELOAD, reload_framing_udp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_RELOAD, reload_framing_tcp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_RELOAD, reload_framing_udp_handle);
 
   heur_dissector_add("udp", dissect_reload_framing_heur, proto_reload_framing);
   heur_dissector_add("tcp", dissect_reload_framing_heur, proto_reload_framing);
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index 7cb6cafac4..ed65c7c9d9 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -237,8 +237,8 @@ proto_reg_handoff_rfc2190(void)
 	dissector_handle_t rfc2190_handle;
 
 	rfc2190_handle = find_dissector("rfc2190");
-	dissector_add("rtp.pt", PT_H263, rfc2190_handle);
-	dissector_add("iax2.codec", AST_FORMAT_H263, rfc2190_handle);
+	dissector_add_uint("rtp.pt", PT_H263, rfc2190_handle);
+	dissector_add_uint("iax2.codec", AST_FORMAT_H263, rfc2190_handle);
 
 	h263_handle = find_dissector("h263data");
 }
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index b6e3ab493a..cdef5cc7bc 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -402,5 +402,5 @@ proto_reg_handoff_rip(void)
 	dissector_handle_t rip_handle;
 
 	rip_handle = create_dissector_handle(dissect_rip, proto_rip);
-	dissector_add("udp.port", UDP_PORT_RIP, rip_handle);
+	dissector_add_uint("udp.port", UDP_PORT_RIP, rip_handle);
 }
diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c
index a2f25b6662..4df7af29f3 100644
--- a/epan/dissectors/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
@@ -148,5 +148,5 @@ proto_reg_handoff_ripng(void)
     dissector_handle_t ripng_handle;
 
     ripng_handle = create_dissector_handle(dissect_ripng, proto_ripng);
-    dissector_add("udp.port", UDP_PORT_RIPNG, ripng_handle);
+    dissector_add_uint("udp.port", UDP_PORT_RIPNG, ripng_handle);
 }
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index f110389f5c..870d1e575a 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -584,5 +584,5 @@ void proto_reg_handoff_rlogin(void)
 {
 	/* Dissector install routine */
 	dissector_handle_t rlogin_handle = create_dissector_handle(dissect_rlogin,proto_rlogin);
-	dissector_add("tcp.port", RLOGIN_PORT, rlogin_handle);
+	dissector_add_uint("tcp.port", RLOGIN_PORT, rlogin_handle);
 }
diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c
index 117b892b42..eda373477a 100644
--- a/epan/dissectors/packet-rmcp.c
+++ b/epan/dissectors/packet-rmcp.c
@@ -140,7 +140,7 @@ dissect_rmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		next_tvb = tvb_new_subset_remaining(tvb, 4);
 
-		if (!dissector_try_port(rmcp_dissector_table, class, next_tvb, pinfo,
+		if (!dissector_try_uint(rmcp_dissector_table, class, next_tvb, pinfo,
 			tree)) {
 			len = call_dissector(data_handle, next_tvb, pinfo, tree);
 			if (len < tvb_length(next_tvb)) {
@@ -251,7 +251,7 @@ proto_reg_handoff_rmcp(void)
 	data_handle = find_dissector("data");
 
 	rmcp_handle = new_create_dissector_handle(dissect_rmcp, proto_rmcp);
-	dissector_add("udp.port", UDP_PORT_RMCP, rmcp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_RMCP, rmcp_handle);
 }
 
 void
@@ -260,5 +260,5 @@ proto_reg_handoff_rsp(void)
 	dissector_handle_t rsp_handle;
 
 	rsp_handle = new_create_dissector_handle(dissect_rsp, proto_rsp);
-	dissector_add("udp.port", UDP_PORT_RMCP_SECURE, rsp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_RMCP_SECURE, rsp_handle);
 }
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index 522d87f435..9b8e044a7e 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -375,5 +375,5 @@ proto_reg_handoff_rmi(void)
     dissector_handle_t rmi_handle;
 
     rmi_handle = create_dissector_handle(dissect_rmi, proto_rmi);
-    dissector_add("tcp.port", TCP_PORT_RMI, rmi_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_RMI, rmi_handle);
 }
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index e1fea09ef1..0f4d8a3326 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -261,6 +261,6 @@ proto_reg_handoff_rmp(void)
 	data_handle = find_dissector("data");
 
 	rmp_handle = find_dissector("rmp");
-	dissector_add("hpext.dxsap", HPEXT_DXSAP, rmp_handle);
-	dissector_add("hpext.dxsap", HPEXT_SXSAP, rmp_handle);
+	dissector_add_uint("hpext.dxsap", HPEXT_DXSAP, rmp_handle);
+	dissector_add_uint("hpext.dxsap", HPEXT_SXSAP, rmp_handle);
 }
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index 3e06a9ec1c..3bc4ba3d9f 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -231,11 +231,11 @@ void proto_reg_handoff_alc(void)
 	} else {
 
 		if (preferences_old.use_default_udp_port)
-			dissector_delete("udp.port", preferences_old.default_udp_port, handle);
+			dissector_delete_uint("udp.port", preferences_old.default_udp_port, handle);
 	}
 
 	if (preferences.use_default_udp_port)
-		dissector_add("udp.port", preferences.default_udp_port, handle);
+		dissector_add_uint("udp.port", preferences.default_udp_port, handle);
 
 	alc_prefs_save(&preferences, &preferences_old);
 
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index e68893542b..58522937ad 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -43112,12 +43112,12 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -55369,7 +55369,7 @@ proto_reg_handoff_rnsap(void)
 	rnsap_handle = find_dissector("rnsap");
 	rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch");
 
-	dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
+	dissector_add_uint("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
 	/* Add heuristic dissector
 	 * Perhaps we want a preference whether the heuristic dissector
 	 * is or isn't enabled
@@ -55379,693 +55379,693 @@ proto_reg_handoff_rnsap(void)
 
 /*--- Included file: packet-rnsap-dis-tab.c ---*/
 #line 1 "packet-rnsap-dis-tab.c"
-  dissector_add("rnsap.ies", id_RTLoadValue, new_create_dissector_handle(dissect_RTLoadValue_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_NRTLoadInformationValue, new_create_dissector_handle(dissect_NRTLoadInformationValue_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UpPTSInterferenceValue, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TUTRANGANSSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementValueInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Rx_Timing_Deviation_Value_LCR, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Angle_Of_Arrival_Value_LCR, new_create_dissector_handle(dissect_Angle_Of_Arrival_Value_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_HS_SICH_Reception_Quality, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Rx_Timing_Deviation_Value_768, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Rx_Timing_Deviation_Value_ext, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_ext_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Extended_Round_Trip_Time_Value, new_create_dissector_handle(dissect_Extended_Round_Trip_Time_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_IPDL_TDD_ParametersLCR, new_create_dissector_handle(dissect_IPDL_TDD_ParametersLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Load_Value_IncrDecrThres, new_create_dissector_handle(dissect_Load_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Transmitted_Carrier_Power_Value_IncrDecrThres, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Received_Total_Wideband_Power_Value_IncrDecrThres, new_create_dissector_handle(dissect_Received_Total_Wideband_Power_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_Timeslot_ISCP_Value_IncrDecrThres, new_create_dissector_handle(dissect_UL_Timeslot_ISCP_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RT_Load_Value_IncrDecrThres, new_create_dissector_handle(dissect_RT_Load_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_NRT_Load_Information_Value_IncrDecrThres, new_create_dissector_handle(dissect_NRT_Load_Information_Value_IncrDecrThres_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TUTRANGPSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementThresholdInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SFNSFNMeasurementThresholdInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementThresholdInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Load_Value, new_create_dissector_handle(dissect_Load_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Transmitted_Carrier_Power_Value, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Received_Total_Wideband_Power_Value, new_create_dissector_handle(dissect_Received_Total_Wideband_Power_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_Timeslot_ISCP_Value, new_create_dissector_handle(dissect_UL_Timeslot_ISCP_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RT_Load_Value, new_create_dissector_handle(dissect_RT_Load_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_NRT_Load_Information_Value, new_create_dissector_handle(dissect_NRT_Load_Information_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TUTRANGANSSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementThresholdInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Neighbouring_UMTS_CellInformationItem, new_create_dissector_handle(dissect_Neighbouring_UMTS_CellInformationItem_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Neighbouring_GSM_CellInformation, new_create_dissector_handle(dissect_Neighbouring_GSM_CellInformationIEs_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_OnModification, new_create_dissector_handle(dissect_OnModification_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SRNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_S_RNTI, new_create_dissector_handle(dissect_S_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_D_RNTI, new_create_dissector_handle(dissect_D_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_AllowedQueuingTime, new_create_dissector_handle(dissect_AllowedQueuingTime_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_FDD_Information, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_SetupRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Transmission_Gap_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Transmission_Gap_Pattern_Sequence_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Active_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Active_Pattern_Sequence_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_SetupRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_Physical_Channel_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_Physical_Channel_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_Physical_Channel_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Physical_Channel_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_TDD_Information, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_TDD_Information, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_Information, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CN_PS_DomainIdentifier, new_create_dissector_handle(dissect_CN_PS_DomainIdentifier_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CN_CS_DomainIdentifier, new_create_dissector_handle(dissect_CN_CS_DomainIdentifier_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseList_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_SetupRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseItem_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_SetupRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_DSCH_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_USCH_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_LCR_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_DSCH_LCR_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_LCR_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_USCH_LCR_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_SetupRspTDD768, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationItem_RL_SetupRspTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_SetupRspTDD768, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationItem_RL_SetupRspTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CauseLevel_RL_SetupFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SuccessfulRL_InformationResponse_RL_SetupFailureFDD, new_create_dissector_handle(dissect_SuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CauseLevel_RL_SetupFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationList_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_AdditionRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseList_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_AdditionRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseItem_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_AdditionRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_FDD_DL_CodeInformation, new_create_dissector_handle(dissect_FDD_DL_CodeInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DSCH_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_USCH_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_LCR_InformationListIEs_RL_AdditionRspTDD, new_create_dissector_handle(dissect_USCH_LCR_InformationListIEs_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationItem_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationItem_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CauseLevel_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CauseLevel_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationList_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_InformationList_RL_DeletionRqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_Information_RL_DeletionRqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_FDD_DCHs_to_Modify, new_create_dissector_handle(dissect_FDD_DCHs_to_Modify_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCHs_to_Add_FDD, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_DeleteList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TDD_DCHs_to_Modify, new_create_dissector_handle(dissect_TDD_DCHs_to_Modify_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCHs_to_Add_TDD, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_ModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCHs_to_Add_TDD, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_ModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCHs_to_Add, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseList_RL_ReconfReadyFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfReadyFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseItem_RL_ReconfReadyFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfReadyFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CauseLevel_RL_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_RL_ReconfFailure_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_ReconfigurationFailure_RL_ReconfFail, new_create_dissector_handle(dissect_RL_ReconfigurationFailure_RL_ReconfFail_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_DeleteList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_ReconfigurationRequestFDD_RL_Information_IEs, new_create_dissector_handle(dissect_RL_ReconfigurationRequestFDD_RL_Information_IEs_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_DeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseList_RL_ReconfRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponseItem_RL_ReconfRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationResponse_RL_ReconfRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_ReconfRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Reporting_Object_RL_FailureInd, new_create_dissector_handle(dissect_Reporting_Object_RL_FailureInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_FailureInd, new_create_dissector_handle(dissect_RL_Information_RL_FailureInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_Information_RL_FailureInd, new_create_dissector_handle(dissect_RL_Set_Information_RL_FailureInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CCTrCH_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_FailureInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Reporing_Object_RL_RestoreInd, new_create_dissector_handle(dissect_Reporting_Object_RL_RestoreInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Information_RL_RestoreInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_Information_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Set_Information_RL_RestoreInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CCTrCH_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_RestoreInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_PowerAdjustmentType, new_create_dissector_handle(dissect_PowerAdjustmentType_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InnerLoopDLPCStatus, new_create_dissector_handle(dissect_InnerLoopDLPCStatus_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DLReferencePowerList_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MaxAdjustmentStep, new_create_dissector_handle(dissect_MaxAdjustmentStep_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_AdjustmentPeriod, new_create_dissector_handle(dissect_AdjustmentPeriod_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_AdjustmentRatio, new_create_dissector_handle(dissect_ScaledAdjustmentRatio_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_ReferencePowerInformation_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformation_DL_PC_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_timeSlot_ISCP, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_PhyChReconfRqstFDD, new_create_dissector_handle(dissect_RL_Information_PhyChReconfRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Information_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_RL_Information_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UL_DPCH_InformationItem_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DL_DPCH_InformationItem_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CongestionCause, new_create_dissector_handle(dissect_CongestionCause_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationList_RL_CongestInd, new_create_dissector_handle(dissect_RL_InformationList_RL_CongestInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_RL_CongestInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_CongestInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DCH_Rate_InformationItem_RL_CongestInd, new_create_dissector_handle(dissect_DCH_Rate_InformationItem_RL_CongestInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_EDCH_MacdFlowSpecificInformationItem_RL_CongestInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationItem_RL_CongestInd_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UC_ID, new_create_dissector_handle(dissect_UC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SAI, new_create_dissector_handle(dissect_SAI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GA_Cell, new_create_dissector_handle(dissect_GA_Cell_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_C_RNTI, new_create_dissector_handle(dissect_C_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_PropagationDelay, new_create_dissector_handle(dissect_PropagationDelay_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_STTD_SupportIndicator, new_create_dissector_handle(dissect_STTD_SupportIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ClosedLoopMode1_SupportIndicator, new_create_dissector_handle(dissect_ClosedLoopMode1_SupportIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_L3_Information, new_create_dissector_handle(dissect_L3_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_URA_Information, new_create_dissector_handle(dissect_URA_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RxTimingDeviationForTA, new_create_dissector_handle(dissect_RxTimingDeviationForTA_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_D_RNTI_ReleaseIndication, new_create_dissector_handle(dissect_D_RNTI_ReleaseIndication_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RANAP_RelocationInformation, new_create_dissector_handle(dissect_RANAP_RelocationInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_PagingArea_PagingRqst, new_create_dissector_handle(dissect_PagingArea_PagingRqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_IMSI, new_create_dissector_handle(dissect_IMSI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DRXCycleLengthCoefficient, new_create_dissector_handle(dissect_DRXCycleLengthCoefficient_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CNOriginatedPage_PagingRqst, new_create_dissector_handle(dissect_CNOriginatedPage_PagingRqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MeasurementID, new_create_dissector_handle(dissect_MeasurementID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rqst, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DedicatedMeasurementType, new_create_dissector_handle(dissect_DedicatedMeasurementType_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MeasurementFilterCoefficient, new_create_dissector_handle(dissect_MeasurementFilterCoefficient_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rsp, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Unsuccessful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Unsuccessful_InformationItem_DM_Fail_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Successful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Successful_InformationItem_DM_Fail_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_Unsuccessful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Set_Unsuccessful_InformationItem_DM_Fail_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_Successful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Set_Successful_InformationItem_DM_Fail_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rprt, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Unsuccessful_InformationItem_DM_Fail_Ind, new_create_dissector_handle(dissect_RL_Unsuccessful_InformationItem_DM_Fail_Ind_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind, new_create_dissector_handle(dissect_RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TransportBearerRequestIndicator, new_create_dissector_handle(dissect_TransportBearerRequestIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TransportBearerID, new_create_dissector_handle(dissect_TransportBearerID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD, new_create_dissector_handle(dissect_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_BindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_FACH_FlowControlInformation, new_create_dissector_handle(dissect_FACH_FlowControlInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD, new_create_dissector_handle(dissect_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CommonMeasurementObjectType_CM_Rqst, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CommonMeasurementType, new_create_dissector_handle(dissect_CommonMeasurementType_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_SFN, new_create_dissector_handle(dissect_SFN_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CommonMeasurementAccuracy, new_create_dissector_handle(dissect_CommonMeasurementAccuracy_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_neighbouringTDDCellMeasurementInformationLCR, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformationLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_neighbouringTDDCellMeasurementInformation768, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformation768_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CommonMeasurementObjectType_CM_Rsp, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_CommonMeasurementObjectType_CM_Rprt, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GSM_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_GSM_Cell_InfEx_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Bearer_Service_List, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Bearer_Service_List_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_InfEx_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ResetIndicator, new_create_dissector_handle(dissect_ResetIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ContextInfoItem_Reset, new_create_dissector_handle(dissect_ContextInfoItem_Reset_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ContextGroupInfoItem_Reset, new_create_dissector_handle(dissect_ContextGroupInfoItem_Reset_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DelayedActivationList_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DelayedActivationInformation_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DelayedActivationList_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_DelayedActivationInformation_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_HSDSCH_FDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Update_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_ParameterUpdateIndicationFDD_RL_InformationList, new_create_dissector_handle(dissect_RL_ParameterUpdateIndicationFDD_RL_InformationList_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RL_ParameterUpdateIndicationFDD_RL_Information_Item, new_create_dissector_handle(dissect_RL_ParameterUpdateIndicationFDD_RL_Information_Item_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_HSDSCH_TDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Update_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementType, new_create_dissector_handle(dissect_UEMeasurementType_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementTimeslotInfoHCR, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfoHCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementTimeslotInfoLCR, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfoLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementReportCharacteristics, new_create_dissector_handle(dissect_UEMeasurementReportCharacteristics_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementParameterModAllow, new_create_dissector_handle(dissect_UEMeasurementParameterModAllow_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEMeasurementValueInformation, new_create_dissector_handle(dissect_UEMeasurementValueInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TraceReference, new_create_dissector_handle(dissect_TraceReference_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UEIdentity, new_create_dissector_handle(dissect_UEIdentity_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TraceRecordingSessionReference, new_create_dissector_handle(dissect_TraceRecordingSessionReference_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ListOfInterfacesToTrace, new_create_dissector_handle(dissect_ListOfInterfacesToTrace_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_TraceDepth, new_create_dissector_handle(dissect_TraceDepth_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_InterfacesToTraceItem, new_create_dissector_handle(dissect_InterfacesToTraceItem_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_UE_State, new_create_dissector_handle(dissect_UE_State_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ProvidedInformation, new_create_dissector_handle(dissect_ProvidedInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TnlQos, new_create_dissector_handle(dissect_TnlQos_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Guaranteed_Rate_Information, new_create_dissector_handle(dissect_Guaranteed_Rate_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TrafficClass, new_create_dissector_handle(dissect_TrafficClass_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Unidirectional_DCH_Indicator, new_create_dissector_handle(dissect_Unidirectional_DCH_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Allowed_Rate_Information, new_create_dissector_handle(dissect_Allowed_Rate_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_ExtendedPropagationDelay, new_create_dissector_handle(dissect_ExtendedPropagationDelay_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DSCH_InitialWindowSize, new_create_dissector_handle(dissect_DSCH_InitialWindowSize_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_BindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator, new_create_dissector_handle(dissect_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_PowerOffset_for_SchedulingInfo, new_create_dissector_handle(dissect_E_DCH_PowerOffset_for_SchedulingInfo_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TrCH_SrcStatisticsDescr, new_create_dissector_handle(dissect_TrCH_SrcStatisticsDescr_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Minimum_Set_E_TFCIValidityIndicator, new_create_dissector_handle(dissect_E_DCH_Minimum_Set_E_TFCIValidityIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_eDCH_MACdFlow_Retransmission_Timer_LCR, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Satellite_Almanac_Information_ExtItem, new_create_dissector_handle(dissect_Satellite_Almanac_Information_ExtItem_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HARQ_Preamble_Mode, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_HSDSCH_MACdPDUSizeFormat_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_User_Plane_Congestion_Fields_Inclusion, new_create_dissector_handle(dissect_User_Plane_Congestion_Fields_Inclusion_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HARQ_Preamble_Mode_Activation_Indicator, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_Activation_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_InformationResponse, new_create_dissector_handle(dissect_MIMO_InformationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_PDSCH_Code_Change_Grant, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Grant_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MaximumMACdPDU_SizeExtended, new_create_dissector_handle(dissect_MAC_PDU_SizeExtended_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_hSSCCH_TDD_Specific_InfoList_Response768, new_create_dissector_handle(dissect_HSSCCH_TDD_Specific_InfoList_Response768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_hSPDSCH_TDD_Specific_InfoList_Response768, new_create_dissector_handle(dissect_HSPDSCH_TDD_Specific_InfoList_Response768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_PDSCH_Code_Change_Indicator, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Information, new_create_dissector_handle(dissect_GANSS_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_neighbouring_LCR_TDD_CellInformation, new_create_dissector_handle(dissect_Neighbouring_LCR_TDD_CellInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RestrictionStateIndicator, new_create_dissector_handle(dissect_RestrictionStateIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DPC_Mode_Change_SupportIndicator, new_create_dissector_handle(dissect_DPC_Mode_Change_SupportIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CoverageIndicator, new_create_dissector_handle(dissect_CoverageIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_AntennaColocationIndicator, new_create_dissector_handle(dissect_AntennaColocationIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HCS_Prio, new_create_dissector_handle(dissect_HCS_Prio_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellCapabilityContainer_FDD, new_create_dissector_handle(dissect_CellCapabilityContainer_FDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SNA_Information, new_create_dissector_handle(dissect_SNA_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_FrequencyBandIndicator, new_create_dissector_handle(dissect_FrequencyBandIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GERAN_Cell_Capability, new_create_dissector_handle(dissect_GERAN_Cell_Capability_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GERAN_Classmark, new_create_dissector_handle(dissect_GERAN_Classmark_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_ExtendedGSMCellIndividualOffset, new_create_dissector_handle(dissect_ExtendedGSMCellIndividualOffset_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellCapabilityContainer_TDD, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellCapabilityContainer_TDD768, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellCapabilityContainer_TDD_LCR, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Cell_Capacity_Class_Value, new_create_dissector_handle(dissect_Cell_Capacity_Class_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_NACC_Related_Data, new_create_dissector_handle(dissect_NACC_Related_Data_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MBMS_Bearer_Service_Full_Address, new_create_dissector_handle(dissect_MBMS_Bearer_Service_Full_Address_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Inter_Frequency_Cell_Information, new_create_dissector_handle(dissect_Inter_Frequency_Cell_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Common_Data, new_create_dissector_handle(dissect_GANSS_Common_Data_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Generic_Data, new_create_dissector_handle(dissect_GANSS_Generic_Data_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UEMeasurementValueTransmittedPowerList768, new_create_dissector_handle(dissect_UEMeasurementValueTransmittedPowerList768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UEMeasurementValueTimeslotISCPList768, new_create_dissector_handle(dissect_UEMeasurementValueTimeslotISCPList768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Extended_SRNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PLCCH_Information_UL_TimeslotLCR_Info, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DPC_Mode, new_create_dissector_handle(dissect_DPC_Mode_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_DPDCHIndicatorEDCH, new_create_dissector_handle(dissect_UL_DPDCHIndicatorEDCH_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Enhanced_PrimaryCPICH_EcNo, new_create_dissector_handle(dissect_Enhanced_PrimaryCPICH_EcNo_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_Specific_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_DCH_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DelayedActivation, new_create_dissector_handle(dissect_DelayedActivation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellPortionID, new_create_dissector_handle(dissect_CellPortionID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_Specific_EDCH_Information, new_create_dissector_handle(dissect_RL_Specific_EDCH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_RL_Indication, new_create_dissector_handle(dissect_EDCH_RL_Indication_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Permanent_NAS_UE_Identity, new_create_dissector_handle(dissect_Permanent_NAS_UE_Identity_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_PowerBalancing_Information, new_create_dissector_handle(dissect_DL_PowerBalancing_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_FDD_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSPDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MBMS_Bearer_Service_List, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDPCH_Information, new_create_dissector_handle(dissect_EDPCH_Information_FDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_FDD_Information, new_create_dissector_handle(dissect_EDCH_FDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Serving_EDCHRL_Id, new_create_dissector_handle(dissect_EDCH_Serving_RL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_F_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Initial_DL_DPCH_TimingAdjustment_Allowed, new_create_dissector_handle(dissect_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DCH_Indicator_For_E_DCH_HSDPA_Operation, new_create_dissector_handle(dissect_DCH_Indicator_For_E_DCH_HSDPA_Operation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Serving_cell_change_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Continuous_Packet_Connectivity_DTX_DRX_Information, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_DTX_DRX_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_F_DPCH_SlotFormatSupportRequest, new_create_dissector_handle(dissect_F_DPCH_SlotFormatSupportRequest_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_Support_8PSK, new_create_dissector_handle(dissect_Support_8PSK_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD768_minimumSpreadingFactor_UL, new_create_dissector_handle(dissect_MinimumSpreadingFactor768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_maxNrDLPhysicalchannels, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannelsTS_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_Support_PLCCH, new_create_dissector_handle(dissect_Support_PLCCH_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD768_minimumSpreadingFactor_DL, new_create_dissector_handle(dissect_MinimumSpreadingFactor768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD768_maxNrDLPhysicalchannels, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannels768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD768_maxNrDLPhysicalchannelsTS, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannelsTS768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TSTD_Support_Indicator_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TSTD_Support_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_Synchronisation_Parameters_LCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PrimaryCCPCH_RSCP_Delta, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_Delta_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_TDD_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Information, new_create_dissector_handle(dissect_E_DCH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Serving_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_768_Information, new_create_dissector_handle(dissect_E_DCH_768_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_LCR_Information, new_create_dissector_handle(dissect_E_DCH_LCR_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GA_CellAdditionalShapes, new_create_dissector_handle(dissect_GA_CellAdditionalShapes_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_PowerBalancing_ActivationIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_ActivationIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Primary_CPICH_Usage_For_Channel_Estimation, new_create_dissector_handle(dissect_Primary_CPICH_Usage_For_Channel_Estimation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Secondary_CPICH_Information, new_create_dissector_handle(dissect_Secondary_CPICH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Active_MBMS_Bearer_ServiceFDD_PFL, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListFDD_PFL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_RLSet_Id, new_create_dissector_handle(dissect_RL_Set_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_FDD_DL_ControlChannelInformation, new_create_dissector_handle(dissect_EDCH_FDD_DL_ControlChannelInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Initial_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_F_DPCH_SlotFormat, new_create_dissector_handle(dissect_F_DPCH_SlotFormat_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_FDD_InformationResponse, new_create_dissector_handle(dissect_EDCH_FDD_InformationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_RNTI, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_FDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SixtyfourQAM_DL_SupportIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_SupportIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TimeSlot_RL_SetupRspTDD, new_create_dissector_handle(dissect_TimeSlot_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_SIR_Target_CCTrCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_LCR_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_LCR_InformationResponse_RL_SetupRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_TDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DSCH_RNTI, new_create_dissector_handle(dissect_DSCH_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Active_MBMS_Bearer_ServiceTDD_PFL, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListTDD_PFL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_InformationResponse_RL_SetupRspTDD768, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Information_Response, new_create_dissector_handle(dissect_E_DCH_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_768_Information_Response, new_create_dissector_handle(dissect_E_DCH_768_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_LCR_Information_Response, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_TimingAdvanceCtrl_LCR, new_create_dissector_handle(dissect_UL_TimingAdvanceCtrl_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_SIR_Target_CCTrCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Max_UE_DTX_Cycle, new_create_dissector_handle(dissect_Max_UE_DTX_Cycle_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SynchronisationIndicator, new_create_dissector_handle(dissect_SynchronisationIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_DSCH_serving_cell_change_information, new_create_dissector_handle(dissect_HS_DSCH_serving_cell_change_information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDPCH_Information_RLAdditionReq_FDD, new_create_dissector_handle(dissect_EDPCH_Information_RLAdditionReq_FDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_Configured_Indicator, new_create_dissector_handle(dissect_HSDSCH_Configured_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_DSCH_serving_cell_change_informationResponse, new_create_dissector_handle(dissect_HS_DSCH_serving_cell_change_informationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Serving_cell_change_informationResponse, new_create_dissector_handle(dissect_E_DCH_Serving_cell_change_informationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MAChs_ResetIndicator, new_create_dissector_handle(dissect_MAChs_ResetIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_LCR_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_LCR_InformationResponse_RL_AdditionRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_InformationResponse_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_DPCH_Power_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Phase_Reference_Update_Indicator, new_create_dissector_handle(dissect_Phase_Reference_Update_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_Information_to_Modify, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_to_Delete_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_FDD_Information_To_Modify, new_create_dissector_handle(dissect_EDCH_FDD_Information_To_Modify_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_MACdFlows_To_Add, new_create_dissector_handle(dissect_EDCH_MACdFlows_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_MACdFlows_To_Delete, new_create_dissector_handle(dissect_EDCH_MACdFlows_To_Delete_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDPCH_Information_RLReconfRequest_FDD, new_create_dissector_handle(dissect_EDPCH_Information_RLReconfRequest_FDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_F_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Fast_Reconfiguration_Mode, new_create_dissector_handle(dissect_Fast_Reconfiguration_Mode_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CPC_Information, new_create_dissector_handle(dissect_CPC_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_TPC_UplinkStepSize_InformationAdd_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_TPC_UplinkStepSize_InformationModify_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_TPC_DownlinkStepSize_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_TPC_DownlinkStepSize_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PrimaryCCPCH_RSCP_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_TimeSlot_ISCP_Info_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_Information_Reconfig_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_768_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_768_Information_Reconfig_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_LCR_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Reconfig_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_PowerBalancing_UpdatedIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_UpdatedIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Secondary_CPICH_Information_Change, new_create_dissector_handle(dissect_Secondary_CPICH_Information_Change_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Fast_Reconfiguration_Permission, new_create_dissector_handle(dissect_Fast_Reconfiguration_Permission_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_secondary_LCR_CCPCH_Info_TDD, new_create_dissector_handle(dissect_Secondary_LCR_CCPCH_Info_TDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_secondary_CCPCH_Info_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_Secondary_CCPCH_Info_TDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RxTimingDeviationForTAext, new_create_dissector_handle(dissect_RxTimingDeviationForTAext_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_UL_DPCH_TimeSlotFormatModifyItem_LCR_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TDD_DL_DPCH_TimeSlotFormatModifyItem_LCR_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Multiple_RL_InformationResponse_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_Multiple_RL_InformationResponse_RL_ReconfReadyTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_ReconfigurationRequestFDD_RL_InformationList, new_create_dissector_handle(dissect_RL_ReconfigurationRequestFDD_RL_InformationList_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_ReferencePowerInformation, new_create_dissector_handle(dissect_DL_ReferencePowerInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_Information_to_Modify_Unsynchronised, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_Unsynchronised_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_ReconfigurationRequestTDD_RL_Information, new_create_dissector_handle(dissect_Multiple_RL_ReconfigurationRequestTDD_RL_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_CCTrCH_InformationList_RL_ReconfRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_ReconfRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RL_ReconfigurationResponseTDD_RL_Information, new_create_dissector_handle(dissect_Multiple_RL_InformationResponse_RL_ReconfRspTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_timeSlot_ISCP_LCR_List_DL_PC_Rqst_TDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PrimCCPCH_RSCP_DL_PC_RqstTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UL_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_UL_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PLCCH_Information_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_DL_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_MacdFlowSpecificInformationList_RL_CongestInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationList_RL_CongestInd_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CommonTransportChannelResourcesInitialisationNotRequired, new_create_dissector_handle(dissect_CommonTransportChannelResourcesInitialisationNotRequired_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Active_MBMS_Bearer_ServiceFDD, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Inter_Frequency_Cell_List, new_create_dissector_handle(dissect_Inter_Frequency_Cell_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Active_MBMS_Bearer_ServiceTDD, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RxTimingDeviationForTA768, new_create_dissector_handle(dissect_RxTimingDeviationForTA768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_URA_ID, new_create_dissector_handle(dissect_URA_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Old_URA_ID, new_create_dissector_handle(dissect_URA_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SRNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_Info_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DPCH_ID768_DM_Rqst, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_PartialReportingIndicator, new_create_dissector_handle(dissect_PartialReportingIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MeasurementRecoveryBehavior, new_create_dissector_handle(dissect_MeasurementRecoveryBehavior_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_AlternativeFormatReportingIndicator, new_create_dissector_handle(dissect_AlternativeFormatReportingIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_Info_DM, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multiple_DedicatedMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multiple_HSSICHMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DPCH_ID768_DM_Rsp, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MeasurementRecoverySupportIndicator, new_create_dissector_handle(dissect_MeasurementRecoverySupportIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DedicatedMeasurementObjectType_DM_Fail, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Fail_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_Info_DM_Rprt, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DPCH_ID768_DM_Rprt, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MeasurementRecoveryReportingIndicator, new_create_dissector_handle(dissect_MeasurementRecoveryReportingIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DedicatedMeasurementObjectType_DM_Fail_Ind, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Fail_Ind_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Enhanced_FACH_Support_Indicator, new_create_dissector_handle(dissect_Enhanced_FACH_Support_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Enhanced_FACH_Information_ResponseFDD, new_create_dissector_handle(dissect_Enhanced_FACH_Information_ResponseFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_S_RNTI, new_create_dissector_handle(dissect_S_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_D_RNTI, new_create_dissector_handle(dissect_D_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_FDD_Update_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Update_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UEMeasurementTimeslotInfo768, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfo768_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Ext_Reference_E_TFCI_PO, new_create_dissector_handle(dissect_Ext_Reference_E_TFCI_PO_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Ext_Max_Bits_MACe_PDU_non_scheduled, new_create_dissector_handle(dissect_Ext_Max_Bits_MACe_PDU_non_scheduled_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HARQ_MemoryPartitioningInfoExtForMIMO, new_create_dissector_handle(dissect_HARQ_MemoryPartitioningInfoExtForMIMO_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_MIMO_ActivationIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_MIMO_Mode_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_N_M_Ratio, new_create_dissector_handle(dissect_MIMO_N_M_Ratio_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TransportBearerNotSetupIndicator, new_create_dissector_handle(dissect_TransportBearerNotSetupIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TransportBearerNotRequestedIndicator, new_create_dissector_handle(dissect_TransportBearerNotRequestedIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UARFCNforNt, new_create_dissector_handle(dissect_UARFCN_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_LCRTDD_uplink_Physical_Channel_Capability, new_create_dissector_handle(dissect_LCRTDD_Uplink_Physical_Channel_Capability_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_number_Of_Supported_Carriers, new_create_dissector_handle(dissect_Number_Of_Supported_Carriers_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_tSN_Length, new_create_dissector_handle(dissect_TSN_Length_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_SICH_ID_Extension, new_create_dissector_handle(dissect_HS_SICH_ID_Extension_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSSICH_Info_DM_Rqst_Extension, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_Extension_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multipleFreq_HSPDSCH_InformationList_ResponseTDDLCR, new_create_dissector_handle(dissect_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_multicarrier_number, new_create_dissector_handle(dissect_Multicarrier_Number_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UPPCHPositionLCR, new_create_dissector_handle(dissect_UPPCHPositionLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UpPCH_InformationList_LCRTDD, new_create_dissector_handle(dissect_UpPCH_InformationList_LCRTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UpPCH_InformationItem_LCRTDD, new_create_dissector_handle(dissect_UpPCH_InformationItem_LCRTDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Multiple_PLMN_List, new_create_dissector_handle(dissect_Multiple_PLMN_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_Capabilities_Info, new_create_dissector_handle(dissect_UE_Capabilities_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_FrameOffset, new_create_dissector_handle(dissect_FrameOffset_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_ChipOffset, new_create_dissector_handle(dissect_ChipOffset_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Enhanced_PCH_Capability, new_create_dissector_handle(dissect_Enhanced_PCH_Capability_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SixteenQAM_UL_Operation_Indicator, new_create_dissector_handle(dissect_SixteenQAM_UL_Operation_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_TFCI_Boost_Information, new_create_dissector_handle(dissect_E_TFCI_Boost_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SixtyfourQAM_UsageAllowedIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_UsageAllowedIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_SixtyfourQAM_DL_UsageIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_UsageIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Default_Serving_Grant_in_DTX_Cycle2, new_create_dissector_handle(dissect_E_Serving_Grant_Value_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DPDCH_PowerInterpolation, new_create_dissector_handle(dissect_E_DPDCH_PowerInterpolation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Extended_E_DCH_LCRTDD_PhysicalLayerCategory, new_create_dissector_handle(dissect_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_E_DCH_MACdPDUSizeFormat_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Deactivate_Indicator, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_less_Deactivate_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_DL_Control_Channel_Change_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Change_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_DL_Control_Channel_Grant_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Grant_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MaximumNumber_Of_Retransmission_For_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_MaxNr_Retransmissions_EDCH_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_RetransmissionTimer_For_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_PUCH_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_with_enhanced_HS_SCCH_support_indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_TBSizeTableIndicator, new_create_dissector_handle(dissect_HSDSCH_TBSizeTableIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DGANSS_Corrections_Req, new_create_dissector_handle(dissect_DGANSS_Corrections_Req_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_AGCH_Table_Choice, new_create_dissector_handle(dissect_E_AGCH_Table_Choice_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RANAP_EnhancedRelocationInformationRequest, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationRequest_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_RANAP_EnhancedRelocationInformationResponse, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationResponse_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Common_EDCH_MAC_d_Flow_Specific_InformationFDD, new_create_dissector_handle(dissect_Common_EDCH_MAC_d_Flow_Specific_InformationFDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Common_EDCH_Support_Indicator, new_create_dissector_handle(dissect_Common_EDCH_Support_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_RNTI, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_Released_CN_Domain, new_create_dissector_handle(dissect_Released_CN_Domain_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rprt, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rqst_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Cell_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rsp_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBMS_Cell_InfEx_Rprt, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rprt_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Counting_Information, new_create_dissector_handle(dissect_Counting_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Transmission_Mode_Information, new_create_dissector_handle(dissect_Transmission_Mode_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MBMS_Neighbouring_Cell_Information, new_create_dissector_handle(dissect_MBMS_Neighbouring_Cell_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MBMS_RLC_Sequence_Number_Information, new_create_dissector_handle(dissect_MBMS_RLC_Sequence_Number_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RLC_Sequence_Number, new_create_dissector_handle(dissect_RLC_Sequence_Number_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Neighbouring_E_UTRA_CellInformation, new_create_dissector_handle(dissect_Neighbouring_E_UTRA_CellInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBSFN_Cluster_Identity, new_create_dissector_handle(dissect_MBSFN_Cluster_Identity_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MCCH_Configuration_Info, new_create_dissector_handle(dissect_MCCH_Configuration_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MCCH_Message_List, new_create_dissector_handle(dissect_MCCH_Message_List_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MBSFN_Scheduling_Transmission_Time_Interval_Info_List, new_create_dissector_handle(dissect_MBSFN_Scheduling_Transmission_Time_Interval_Info_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Time_ID, new_create_dissector_handle(dissect_GANSS_Time_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_AddNavigationModelsReq, new_create_dissector_handle(dissect_GANSS_AddNavigationModelsReq_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_AddUTCModelsReq, new_create_dissector_handle(dissect_GANSS_AddUTCModelsReq_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_AuxInfoReq, new_create_dissector_handle(dissect_GANSS_AuxInfoReq_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_ID, new_create_dissector_handle(dissect_GANSS_ID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MinimumReducedE_DPDCH_GainFactor, new_create_dissector_handle(dissect_MinimumReducedE_DPDCH_GainFactor_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Enhanced_FACH_Information_ResponseLCR, new_create_dissector_handle(dissect_Enhanced_FACH_Information_ResponseLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Common_EDCH_MAC_d_Flow_Specific_InformationLCR, new_create_dissector_handle(dissect_Common_EDCH_MAC_d_Flow_Specific_InformationLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_PreconfigurationSetup, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationSetup_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_PreconfigurationInfo, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationInfo_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_NoOfTargetCellHS_SCCH_Order, new_create_dissector_handle(dissect_NoOfTargetCellHS_SCCH_Order_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EnhancedHSServingCC_Abort, new_create_dissector_handle(dissect_EnhancedHSServingCC_Abort_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_RL_Setup, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Setup_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_Response_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_RL_Addition, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Addition_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Change_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Change_Information_Response_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Req_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_RL_Reconf_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_RL_Reconf_Response_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_HS_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Param_Upd_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Secondary_Serving_Cell_List, new_create_dissector_handle(dissect_Secondary_Serving_Cell_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MultiCarrier_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_LCRTDD_HSDSCH_Physical_Layer_Category_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_IdleIntervalInformation, new_create_dissector_handle(dissect_IdleIntervalInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_NeedforIdleInterval, new_create_dissector_handle(dissect_NeedforIdleInterval_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_IdleIntervalConfigurationIndicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_ContinuousPacketConnectivity_DRX_InformationLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_InformationLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_ContinuousPacketConnectivity_DRX_Information_ResponseLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_AGCH_UE_Inactivity_Monitor_Threshold, new_create_dissector_handle(dissect_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CPC_InformationLCR, new_create_dissector_handle(dissect_CPC_InformationLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_SFMode_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_SFMode_Supported_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MIMO_ReferenceSignal_InformationListLCR, new_create_dissector_handle(dissect_MIMO_ReferenceSignal_InformationListLCR_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianNAVAlmanac_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianReducedAlmanac_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianMidiAlmanac_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_alm_keplerianGLONASS_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_alm_ecefSBASAlmanac_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DL_RLC_PDU_Size_Format, new_create_dissector_handle(dissect_DL_RLC_PDU_Size_Format_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_MACes_Maximum_Bitrate_LCR, new_create_dissector_handle(dissect_MACes_Maximum_Bitrate_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Single_Stream_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_ActivationIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Single_Stream_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_Mode_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Dual_Band_Secondary_Serving_Cell_List, new_create_dissector_handle(dissect_Secondary_Serving_Cell_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_power_offset_for_S_CPICH_for_MIMO, new_create_dissector_handle(dissect_PowerOffsetForSecondaryCPICHforMIMO_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_power_offset_for_S_CPICH_for_MIMO_Request_Indicator, new_create_dissector_handle(dissect_PowerOffsetForSecondaryCPICHforMIMORequestIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_SupportIndicatorExtension, new_create_dissector_handle(dissect_UE_SupportIndicatorExtension_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_ActivationInformation, new_create_dissector_handle(dissect_ActivationInformation_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellPortionLCRID, new_create_dissector_handle(dissect_CellPortionLCRID_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Setup_Req, new_create_dissector_handle(dissect_Additional_EDCH_Setup_Info_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Add_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Add_Req_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_Response_RLAdd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLAddList_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Param_Upd_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Preconfiguration_Information, new_create_dissector_handle(dissect_Additional_EDCH_Preconfiguration_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MulticellEDCH_Information, new_create_dissector_handle(dissect_MulticellEDCH_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Additional_EDCH_Cell_Information_ResponseRLReconf, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLReconf_List_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_EDCH_Indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DiversityMode, new_create_dissector_handle(dissect_DiversityMode_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TransmitDiversityIndicator, new_create_dissector_handle(dissect_TransmitDiversityIndicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_NonCellSpecificTxDiversity, new_create_dissector_handle(dissect_NonCellSpecificTxDiversity_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_CellCapabilityContainerExtension_FDD, new_create_dissector_handle(dissect_CellCapabilityContainerExtension_FDD_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_HSDSCH_Physical_Layer_Category_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_E_RNTI_For_FACH, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_H_RNTI_For_FACH, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_RNTI_Allocation_Indicator, new_create_dissector_handle(dissect_RNTI_Allocation_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_AggregateMaximumBitRate_Enforcement_Indicator, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DCH_MeasurementOccasion_Information, new_create_dissector_handle(dissect_DCH_MeasurementOccasion_Information_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DCH_MeasurementType_Indicator, new_create_dissector_handle(dissect_DCH_MeasurementType_Indicator_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_Out_of_Sychronization_Window, new_create_dissector_handle(dissect_Out_of_Sychronization_Window_PDU, proto_rnsap));
-  dissector_add("rnsap.ies", id_MulticellEDCH_RL_SpecificInformation, new_create_dissector_handle(dissect_MulticellEDCH_RL_SpecificInformationItemIEs_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_TS0_HS_PDSCH_Indication_LCR, new_create_dissector_handle(dissect_TS0_HS_PDSCH_Indication_LCR_PDU, proto_rnsap));
-  dissector_add("rnsap.extension", id_UE_TS0_CapabilityLCR, new_create_dissector_handle(dissect_UE_TS0_CapabilityLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RTLoadValue, new_create_dissector_handle(dissect_RTLoadValue_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_NRTLoadInformationValue, new_create_dissector_handle(dissect_NRTLoadInformationValue_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UpPTSInterferenceValue, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TUTRANGANSSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementValueInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Rx_Timing_Deviation_Value_LCR, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Angle_Of_Arrival_Value_LCR, new_create_dissector_handle(dissect_Angle_Of_Arrival_Value_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_HS_SICH_Reception_Quality, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Rx_Timing_Deviation_Value_768, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Rx_Timing_Deviation_Value_ext, new_create_dissector_handle(dissect_Rx_Timing_Deviation_Value_ext_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Extended_Round_Trip_Time_Value, new_create_dissector_handle(dissect_Extended_Round_Trip_Time_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_IPDL_TDD_ParametersLCR, new_create_dissector_handle(dissect_IPDL_TDD_ParametersLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Load_Value_IncrDecrThres, new_create_dissector_handle(dissect_Load_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Transmitted_Carrier_Power_Value_IncrDecrThres, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Received_Total_Wideband_Power_Value_IncrDecrThres, new_create_dissector_handle(dissect_Received_Total_Wideband_Power_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_Timeslot_ISCP_Value_IncrDecrThres, new_create_dissector_handle(dissect_UL_Timeslot_ISCP_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RT_Load_Value_IncrDecrThres, new_create_dissector_handle(dissect_RT_Load_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_NRT_Load_Information_Value_IncrDecrThres, new_create_dissector_handle(dissect_NRT_Load_Information_Value_IncrDecrThres_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TUTRANGPSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementThresholdInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SFNSFNMeasurementThresholdInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementThresholdInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Load_Value, new_create_dissector_handle(dissect_Load_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Transmitted_Carrier_Power_Value, new_create_dissector_handle(dissect_Transmitted_Carrier_Power_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Received_Total_Wideband_Power_Value, new_create_dissector_handle(dissect_Received_Total_Wideband_Power_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_Timeslot_ISCP_Value, new_create_dissector_handle(dissect_UL_Timeslot_ISCP_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RT_Load_Value, new_create_dissector_handle(dissect_RT_Load_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_NRT_Load_Information_Value, new_create_dissector_handle(dissect_NRT_Load_Information_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_HS_SICH_Reception_Quality_Measurement_Value, new_create_dissector_handle(dissect_HS_SICH_Reception_Quality_Measurement_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TUTRANGANSSMeasurementThresholdInformation, new_create_dissector_handle(dissect_TUTRANGANSSMeasurementThresholdInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Neighbouring_UMTS_CellInformationItem, new_create_dissector_handle(dissect_Neighbouring_UMTS_CellInformationItem_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Neighbouring_GSM_CellInformation, new_create_dissector_handle(dissect_Neighbouring_GSM_CellInformationIEs_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_OnModification, new_create_dissector_handle(dissect_OnModification_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SRNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_S_RNTI, new_create_dissector_handle(dissect_S_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_D_RNTI, new_create_dissector_handle(dissect_D_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_AllowedQueuingTime, new_create_dissector_handle(dissect_AllowedQueuingTime_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_FDD_Information, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_SetupRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Transmission_Gap_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Transmission_Gap_Pattern_Sequence_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Active_Pattern_Sequence_Information, new_create_dissector_handle(dissect_Active_Pattern_Sequence_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_RL_SetupRqstFDD, new_create_dissector_handle(dissect_RL_InformationItem_RL_SetupRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_Physical_Channel_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_Physical_Channel_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_Physical_Channel_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_Physical_Channel_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationList_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_TDD_Information, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_TDD_Information, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_Information, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationItem_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CN_PS_DomainIdentifier, new_create_dissector_handle(dissect_CN_PS_DomainIdentifier_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CN_CS_DomainIdentifier, new_create_dissector_handle(dissect_CN_CS_DomainIdentifier_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseList_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_SetupRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseItem_RL_SetupRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_SetupRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_DSCH_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_USCH_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_LCR_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_DSCH_LCR_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_LCR_InformationListIEs_RL_SetupRspTDD, new_create_dissector_handle(dissect_USCH_LCR_InformationListIEs_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_SetupRspTDD768, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationItem_RL_SetupRspTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_SetupRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_SetupRspTDD768, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationItem_RL_SetupRspTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_SetupRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CauseLevel_RL_SetupFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SuccessfulRL_InformationResponse_RL_SetupFailureFDD, new_create_dissector_handle(dissect_SuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CauseLevel_RL_SetupFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_SetupFailureTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationList_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_AdditionRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_AdditionRqstFDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_RL_Information_RL_AdditionRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationItem_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseList_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_AdditionRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseItem_RL_AdditionRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_AdditionRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_FDD_DL_CodeInformation, new_create_dissector_handle(dissect_FDD_DL_CodeInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DSCH_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_USCH_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_LCR_InformationListIEs_RL_AdditionRspTDD, new_create_dissector_handle(dissect_USCH_LCR_InformationListIEs_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationItem_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationItem_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CauseLevel_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD, new_create_dissector_handle(dissect_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CauseLevel_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_CauseLevel_RL_AdditionFailureTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD, new_create_dissector_handle(dissect_UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationList_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_InformationList_RL_DeletionRqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_DeletionRqst, new_create_dissector_handle(dissect_RL_Information_RL_DeletionRqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_FDD_DCHs_to_Modify, new_create_dissector_handle(dissect_FDD_DCHs_to_Modify_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCHs_to_Add_FDD, new_create_dissector_handle(dissect_DCH_FDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_DeleteList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationList_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_InformationList_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TDD_DCHs_to_Modify, new_create_dissector_handle(dissect_TDD_DCHs_to_Modify_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCHs_to_Add_TDD, new_create_dissector_handle(dissect_DCH_TDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_ModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCHs_to_Add_TDD, new_create_dissector_handle(dissect_DSCH_TDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DSCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_ModifyList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_ModifyList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCHs_to_Add, new_create_dissector_handle(dissect_USCH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCH_DeleteList_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_USCH_DeleteList_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseList_RL_ReconfReadyFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfReadyFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseItem_RL_ReconfReadyFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfReadyFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_CCTrCHInformationListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CauseLevel_RL_ReconfFailure, new_create_dissector_handle(dissect_CauseLevel_RL_ReconfFailure_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_ReconfigurationFailure_RL_ReconfFail, new_create_dissector_handle(dissect_RL_ReconfigurationFailure_RL_ReconfFail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_UL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_Information_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DL_DPCH_Information_RL_ReconfRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_DeleteList_RL_ReconfRqstFDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_ReconfigurationRequestFDD_RL_Information_IEs, new_create_dissector_handle(dissect_RL_ReconfigurationRequestFDD_RL_Information_IEs_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_DeleteList_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DCH_DeleteList_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseList_RL_ReconfRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseList_RL_ReconfRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponseItem_RL_ReconfRspFDD, new_create_dissector_handle(dissect_RL_InformationResponseItem_RL_ReconfRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationResponse_RL_ReconfRspTDD, new_create_dissector_handle(dissect_RL_InformationResponse_RL_ReconfRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Reporting_Object_RL_FailureInd, new_create_dissector_handle(dissect_Reporting_Object_RL_FailureInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_FailureInd, new_create_dissector_handle(dissect_RL_Information_RL_FailureInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_Information_RL_FailureInd, new_create_dissector_handle(dissect_RL_Set_Information_RL_FailureInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CCTrCH_InformationItem_RL_FailureInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_FailureInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Reporing_Object_RL_RestoreInd, new_create_dissector_handle(dissect_Reporting_Object_RL_RestoreInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Information_RL_RestoreInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_Information_RL_RestoreInd, new_create_dissector_handle(dissect_RL_Set_Information_RL_RestoreInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CCTrCH_InformationItem_RL_RestoreInd, new_create_dissector_handle(dissect_CCTrCH_InformationItem_RL_RestoreInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_PowerAdjustmentType, new_create_dissector_handle(dissect_PowerAdjustmentType_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InnerLoopDLPCStatus, new_create_dissector_handle(dissect_InnerLoopDLPCStatus_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DLReferencePowerList_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MaxAdjustmentStep, new_create_dissector_handle(dissect_MaxAdjustmentStep_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_AdjustmentPeriod, new_create_dissector_handle(dissect_AdjustmentPeriod_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_AdjustmentRatio, new_create_dissector_handle(dissect_ScaledAdjustmentRatio_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_ReferencePowerInformation_DL_PC_Rqst, new_create_dissector_handle(dissect_DL_ReferencePowerInformation_DL_PC_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_timeSlot_ISCP, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_PhyChReconfRqstFDD, new_create_dissector_handle(dissect_RL_Information_PhyChReconfRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Information_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_RL_Information_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UL_DPCH_InformationItem_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DL_DPCH_InformationItem_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CongestionCause, new_create_dissector_handle(dissect_CongestionCause_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationList_RL_CongestInd, new_create_dissector_handle(dissect_RL_InformationList_RL_CongestInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_RL_CongestInd, new_create_dissector_handle(dissect_RL_InformationItem_RL_CongestInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DCH_Rate_InformationItem_RL_CongestInd, new_create_dissector_handle(dissect_DCH_Rate_InformationItem_RL_CongestInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_EDCH_MacdFlowSpecificInformationItem_RL_CongestInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationItem_RL_CongestInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UC_ID, new_create_dissector_handle(dissect_UC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SAI, new_create_dissector_handle(dissect_SAI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GA_Cell, new_create_dissector_handle(dissect_GA_Cell_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_C_RNTI, new_create_dissector_handle(dissect_C_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_PropagationDelay, new_create_dissector_handle(dissect_PropagationDelay_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_STTD_SupportIndicator, new_create_dissector_handle(dissect_STTD_SupportIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ClosedLoopMode1_SupportIndicator, new_create_dissector_handle(dissect_ClosedLoopMode1_SupportIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_L3_Information, new_create_dissector_handle(dissect_L3_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_URA_Information, new_create_dissector_handle(dissect_URA_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RxTimingDeviationForTA, new_create_dissector_handle(dissect_RxTimingDeviationForTA_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_D_RNTI_ReleaseIndication, new_create_dissector_handle(dissect_D_RNTI_ReleaseIndication_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RANAP_RelocationInformation, new_create_dissector_handle(dissect_RANAP_RelocationInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_PagingArea_PagingRqst, new_create_dissector_handle(dissect_PagingArea_PagingRqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_IMSI, new_create_dissector_handle(dissect_IMSI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DRXCycleLengthCoefficient, new_create_dissector_handle(dissect_DRXCycleLengthCoefficient_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CNOriginatedPage_PagingRqst, new_create_dissector_handle(dissect_CNOriginatedPage_PagingRqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MeasurementID, new_create_dissector_handle(dissect_MeasurementID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rqst, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DedicatedMeasurementType, new_create_dissector_handle(dissect_DedicatedMeasurementType_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MeasurementFilterCoefficient, new_create_dissector_handle(dissect_MeasurementFilterCoefficient_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_InformationItem_DM_Rqst, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rsp, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_InformationItem_DM_Rsp, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Unsuccessful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Unsuccessful_InformationItem_DM_Fail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Successful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Successful_InformationItem_DM_Fail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_Unsuccessful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Set_Unsuccessful_InformationItem_DM_Fail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_Successful_InformationItem_DM_Fail, new_create_dissector_handle(dissect_RL_Set_Successful_InformationItem_DM_Fail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DedicatedMeasurementObjectType_DM_Rprt, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_InformationItem_DM_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_InformationItem_DM_Rprt, new_create_dissector_handle(dissect_RL_Set_InformationItem_DM_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Unsuccessful_InformationItem_DM_Fail_Ind, new_create_dissector_handle(dissect_RL_Unsuccessful_InformationItem_DM_Fail_Ind_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind, new_create_dissector_handle(dissect_RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TransportBearerRequestIndicator, new_create_dissector_handle(dissect_TransportBearerRequestIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TransportBearerID, new_create_dissector_handle(dissect_TransportBearerID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD, new_create_dissector_handle(dissect_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_BindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_FACH_FlowControlInformation, new_create_dissector_handle(dissect_FACH_FlowControlInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD, new_create_dissector_handle(dissect_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CommonMeasurementObjectType_CM_Rqst, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CommonMeasurementType, new_create_dissector_handle(dissect_CommonMeasurementType_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SFNReportingIndicator, new_create_dissector_handle(dissect_FNReportingIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_SFN, new_create_dissector_handle(dissect_SFN_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CommonMeasurementAccuracy, new_create_dissector_handle(dissect_CommonMeasurementAccuracy_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_neighbouringTDDCellMeasurementInformationLCR, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformationLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_neighbouringTDDCellMeasurementInformation768, new_create_dissector_handle(dissect_NeighbouringTDDCellMeasurementInformation768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CommonMeasurementObjectType_CM_Rsp, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_CommonMeasurementObjectType_CM_Rprt, new_create_dissector_handle(dissect_CommonMeasurementObjectType_CM_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationExchangeID, new_create_dissector_handle(dissect_InformationExchangeID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rqst, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationType, new_create_dissector_handle(dissect_InformationType_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationReportCharacteristics, new_create_dissector_handle(dissect_InformationReportCharacteristics_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GSM_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_GSM_Cell_InfEx_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Bearer_Service_List, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rsp, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Bearer_Service_List_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_InfEx_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InformationExchangeObjectType_InfEx_Rprt, new_create_dissector_handle(dissect_InformationExchangeObjectType_InfEx_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ResetIndicator, new_create_dissector_handle(dissect_ResetIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ContextInfoItem_Reset, new_create_dissector_handle(dissect_ContextInfoItem_Reset_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ContextGroupInfoItem_Reset, new_create_dissector_handle(dissect_ContextGroupInfoItem_Reset_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DelayedActivationList_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DelayedActivationInformation_RL_ActivationCmdFDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DelayedActivationList_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_DelayedActivationInformation_RL_ActivationCmdTDD, new_create_dissector_handle(dissect_DelayedActivationInformation_RL_ActivationCmdTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_HSDSCH_FDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Update_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_ParameterUpdateIndicationFDD_RL_InformationList, new_create_dissector_handle(dissect_RL_ParameterUpdateIndicationFDD_RL_InformationList_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RL_ParameterUpdateIndicationFDD_RL_Information_Item, new_create_dissector_handle(dissect_RL_ParameterUpdateIndicationFDD_RL_Information_Item_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_HSDSCH_TDD_Update_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Update_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementType, new_create_dissector_handle(dissect_UEMeasurementType_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementTimeslotInfoHCR, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfoHCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementTimeslotInfoLCR, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfoLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementReportCharacteristics, new_create_dissector_handle(dissect_UEMeasurementReportCharacteristics_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementParameterModAllow, new_create_dissector_handle(dissect_UEMeasurementParameterModAllow_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEMeasurementValueInformation, new_create_dissector_handle(dissect_UEMeasurementValueInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TraceReference, new_create_dissector_handle(dissect_TraceReference_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UEIdentity, new_create_dissector_handle(dissect_UEIdentity_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TraceRecordingSessionReference, new_create_dissector_handle(dissect_TraceRecordingSessionReference_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ListOfInterfacesToTrace, new_create_dissector_handle(dissect_ListOfInterfacesToTrace_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_TraceDepth, new_create_dissector_handle(dissect_TraceDepth_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_InterfacesToTraceItem, new_create_dissector_handle(dissect_InterfacesToTraceItem_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_UE_State, new_create_dissector_handle(dissect_UE_State_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ProvidedInformation, new_create_dissector_handle(dissect_ProvidedInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TnlQos, new_create_dissector_handle(dissect_TnlQos_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Guaranteed_Rate_Information, new_create_dissector_handle(dissect_Guaranteed_Rate_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TrafficClass, new_create_dissector_handle(dissect_TrafficClass_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Unidirectional_DCH_Indicator, new_create_dissector_handle(dissect_Unidirectional_DCH_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Allowed_Rate_Information, new_create_dissector_handle(dissect_Allowed_Rate_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_ExtendedPropagationDelay, new_create_dissector_handle(dissect_ExtendedPropagationDelay_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationItem, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DSCH_InitialWindowSize, new_create_dissector_handle(dissect_DSCH_InitialWindowSize_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_BindingID, new_create_dissector_handle(dissect_BindingID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TransportLayerAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator, new_create_dissector_handle(dissect_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_PowerOffset_for_SchedulingInfo, new_create_dissector_handle(dissect_E_DCH_PowerOffset_for_SchedulingInfo_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TrCH_SrcStatisticsDescr, new_create_dissector_handle(dissect_TrCH_SrcStatisticsDescr_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Minimum_Set_E_TFCIValidityIndicator, new_create_dissector_handle(dissect_E_DCH_Minimum_Set_E_TFCIValidityIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_eDCH_MACdFlow_Retransmission_Timer_LCR, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Satellite_Almanac_Information_ExtItem, new_create_dissector_handle(dissect_Satellite_Almanac_Information_ExtItem_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HARQ_Preamble_Mode, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_HSDSCH_MACdPDUSizeFormat_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_User_Plane_Congestion_Fields_Inclusion, new_create_dissector_handle(dissect_User_Plane_Congestion_Fields_Inclusion_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HARQ_Preamble_Mode_Activation_Indicator, new_create_dissector_handle(dissect_HARQ_Preamble_Mode_Activation_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_InformationResponse, new_create_dissector_handle(dissect_MIMO_InformationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_PDSCH_Code_Change_Grant, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Grant_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MaximumMACdPDU_SizeExtended, new_create_dissector_handle(dissect_MAC_PDU_SizeExtended_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_hSSCCH_TDD_Specific_InfoList_Response768, new_create_dissector_handle(dissect_HSSCCH_TDD_Specific_InfoList_Response768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_hSPDSCH_TDD_Specific_InfoList_Response768, new_create_dissector_handle(dissect_HSPDSCH_TDD_Specific_InfoList_Response768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_PDSCH_Code_Change_Indicator, new_create_dissector_handle(dissect_HS_PDSCH_Code_Change_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Information, new_create_dissector_handle(dissect_GANSS_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_neighbouring_LCR_TDD_CellInformation, new_create_dissector_handle(dissect_Neighbouring_LCR_TDD_CellInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Extended_RNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RestrictionStateIndicator, new_create_dissector_handle(dissect_RestrictionStateIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DPC_Mode_Change_SupportIndicator, new_create_dissector_handle(dissect_DPC_Mode_Change_SupportIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CoverageIndicator, new_create_dissector_handle(dissect_CoverageIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_AntennaColocationIndicator, new_create_dissector_handle(dissect_AntennaColocationIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HCS_Prio, new_create_dissector_handle(dissect_HCS_Prio_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellCapabilityContainer_FDD, new_create_dissector_handle(dissect_CellCapabilityContainer_FDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SNA_Information, new_create_dissector_handle(dissect_SNA_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_FrequencyBandIndicator, new_create_dissector_handle(dissect_FrequencyBandIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GERAN_Cell_Capability, new_create_dissector_handle(dissect_GERAN_Cell_Capability_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GERAN_Classmark, new_create_dissector_handle(dissect_GERAN_Classmark_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_ExtendedGSMCellIndividualOffset, new_create_dissector_handle(dissect_ExtendedGSMCellIndividualOffset_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellCapabilityContainer_TDD, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellCapabilityContainer_TDD768, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellCapabilityContainer_TDD_LCR, new_create_dissector_handle(dissect_CellCapabilityContainer_TDD_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Cell_Capacity_Class_Value, new_create_dissector_handle(dissect_Cell_Capacity_Class_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_NACC_Related_Data, new_create_dissector_handle(dissect_NACC_Related_Data_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MBMS_Bearer_Service_Full_Address, new_create_dissector_handle(dissect_MBMS_Bearer_Service_Full_Address_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Inter_Frequency_Cell_Information, new_create_dissector_handle(dissect_Inter_Frequency_Cell_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Common_Data, new_create_dissector_handle(dissect_GANSS_Common_Data_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Generic_Data, new_create_dissector_handle(dissect_GANSS_Generic_Data_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UEMeasurementValueTransmittedPowerList768, new_create_dissector_handle(dissect_UEMeasurementValueTransmittedPowerList768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UEMeasurementValueTimeslotISCPList768, new_create_dissector_handle(dissect_UEMeasurementValueTimeslotISCPList768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Extended_SRNC_ID, new_create_dissector_handle(dissect_Extended_RNC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PLCCH_Information_UL_TimeslotLCR_Info, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DPC_Mode, new_create_dissector_handle(dissect_DPC_Mode_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_DPDCHIndicatorEDCH, new_create_dissector_handle(dissect_UL_DPDCHIndicatorEDCH_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Enhanced_PrimaryCPICH_EcNo, new_create_dissector_handle(dissect_Enhanced_PrimaryCPICH_EcNo_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_Specific_DCH_Info, new_create_dissector_handle(dissect_RL_Specific_DCH_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DelayedActivation, new_create_dissector_handle(dissect_DelayedActivation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellPortionID, new_create_dissector_handle(dissect_CellPortionID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_Specific_EDCH_Information, new_create_dissector_handle(dissect_RL_Specific_EDCH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_RL_Indication, new_create_dissector_handle(dissect_EDCH_RL_Indication_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Permanent_NAS_UE_Identity, new_create_dissector_handle(dissect_Permanent_NAS_UE_Identity_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_PowerBalancing_Information, new_create_dissector_handle(dissect_DL_PowerBalancing_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_FDD_Information, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSPDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MBMS_Bearer_Service_List, new_create_dissector_handle(dissect_MBMS_Bearer_Service_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDPCH_Information, new_create_dissector_handle(dissect_EDPCH_Information_FDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_FDD_Information, new_create_dissector_handle(dissect_EDCH_FDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Serving_EDCHRL_Id, new_create_dissector_handle(dissect_EDCH_Serving_RL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_F_DPCH_Information_RL_SetupRqstFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_SetupRqstFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Initial_DL_DPCH_TimingAdjustment_Allowed, new_create_dissector_handle(dissect_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DCH_Indicator_For_E_DCH_HSDPA_Operation, new_create_dissector_handle(dissect_DCH_Indicator_For_E_DCH_HSDPA_Operation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Serving_cell_change_CFN, new_create_dissector_handle(dissect_CFN_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Continuous_Packet_Connectivity_DTX_DRX_Information, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_DTX_DRX_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_F_DPCH_SlotFormatSupportRequest, new_create_dissector_handle(dissect_F_DPCH_SlotFormatSupportRequest_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_Support_8PSK, new_create_dissector_handle(dissect_Support_8PSK_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD768_minimumSpreadingFactor_UL, new_create_dissector_handle(dissect_MinimumSpreadingFactor768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_maxNrDLPhysicalchannels, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannelsTS_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_Support_PLCCH, new_create_dissector_handle(dissect_Support_PLCCH_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD768_minimumSpreadingFactor_DL, new_create_dissector_handle(dissect_MinimumSpreadingFactor768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD768_maxNrDLPhysicalchannels, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannels768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD768_maxNrDLPhysicalchannelsTS, new_create_dissector_handle(dissect_MaxNrDLPhysicalchannelsTS768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_TPC_UplinkStepSize_LCR_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_SetupRqstTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TSTD_Support_Indicator_RL_SetupRqstTDD, new_create_dissector_handle(dissect_TSTD_Support_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_Synchronisation_Parameters_LCR, new_create_dissector_handle(dissect_UL_Synchronisation_Parameters_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PrimaryCCPCH_RSCP_Delta, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_Delta_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_TDD_Information, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PDSCH_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Information, new_create_dissector_handle(dissect_E_DCH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Serving_RL_ID, new_create_dissector_handle(dissect_RL_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_768_Information, new_create_dissector_handle(dissect_E_DCH_768_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_LCR_Information, new_create_dissector_handle(dissect_E_DCH_LCR_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GA_CellAdditionalShapes, new_create_dissector_handle(dissect_GA_CellAdditionalShapes_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_PowerBalancing_ActivationIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_ActivationIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Primary_CPICH_Usage_For_Channel_Estimation, new_create_dissector_handle(dissect_Primary_CPICH_Usage_For_Channel_Estimation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Secondary_CPICH_Information, new_create_dissector_handle(dissect_Secondary_CPICH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Active_MBMS_Bearer_ServiceFDD_PFL, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListFDD_PFL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_RLSet_Id, new_create_dissector_handle(dissect_RL_Set_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_FDD_DL_ControlChannelInformation, new_create_dissector_handle(dissect_EDCH_FDD_DL_ControlChannelInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Initial_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_F_DPCH_SlotFormat, new_create_dissector_handle(dissect_F_DPCH_SlotFormat_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DCH_InformationResponse, new_create_dissector_handle(dissect_DCH_InformationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_FDD_InformationResponse, new_create_dissector_handle(dissect_EDCH_FDD_InformationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_RNTI, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_FDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_FDD_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SixtyfourQAM_DL_SupportIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_SupportIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TimeSlot_RL_SetupRspTDD, new_create_dissector_handle(dissect_TimeSlot_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_SIR_Target_CCTrCH_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_SetupRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_LCR_InformationResponse_RL_SetupRspTDD, new_create_dissector_handle(dissect_RL_LCR_InformationResponse_RL_SetupRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_TDD_Information_Response, new_create_dissector_handle(dissect_HSDSCH_TDD_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DSCH_RNTI, new_create_dissector_handle(dissect_DSCH_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Active_MBMS_Bearer_ServiceTDD_PFL, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListTDD_PFL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_InformationResponse_RL_SetupRspTDD768, new_create_dissector_handle(dissect_RL_InformationResponse_RL_SetupRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Information_Response, new_create_dissector_handle(dissect_E_DCH_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_768_Information_Response, new_create_dissector_handle(dissect_E_DCH_768_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_LCR_Information_Response, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_TimingAdvanceCtrl_LCR, new_create_dissector_handle(dissect_UL_TimingAdvanceCtrl_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_SIR_Target_CCTrCH_LCR_InformationItem_RL_SetupRspTDD, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Max_UE_DTX_Cycle, new_create_dissector_handle(dissect_Max_UE_DTX_Cycle_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DLReferencePower, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SynchronisationIndicator, new_create_dissector_handle(dissect_SynchronisationIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_DSCH_serving_cell_change_information, new_create_dissector_handle(dissect_HS_DSCH_serving_cell_change_information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDPCH_Information_RLAdditionReq_FDD, new_create_dissector_handle(dissect_EDPCH_Information_RLAdditionReq_FDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_Configured_Indicator, new_create_dissector_handle(dissect_HSDSCH_Configured_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_CCTrCH_InformationList_RL_AdditionRqstTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_DSCH_serving_cell_change_informationResponse, new_create_dissector_handle(dissect_HS_DSCH_serving_cell_change_informationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Serving_cell_change_informationResponse, new_create_dissector_handle(dissect_E_DCH_Serving_cell_change_informationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MAChs_ResetIndicator, new_create_dissector_handle(dissect_MAChs_ResetIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_AdditionRspTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_LCR_InformationResponse_RL_AdditionRspTDD, new_create_dissector_handle(dissect_RL_LCR_InformationResponse_RL_AdditionRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_InformationResponse_RL_AdditionRspTDD768, new_create_dissector_handle(dissect_RL_InformationResponse_RL_AdditionRspTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_DPCH_Power_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_DPCH_TimingAdjustment, new_create_dissector_handle(dissect_DL_DPCH_TimingAdjustment_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Phase_Reference_Update_Indicator, new_create_dissector_handle(dissect_Phase_Reference_Update_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_Information_to_Modify, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_MACdFlows_to_Add, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_MACdFlows_to_Delete, new_create_dissector_handle(dissect_HSDSCH_MACdFlows_to_Delete_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_FDD_Information_To_Modify, new_create_dissector_handle(dissect_EDCH_FDD_Information_To_Modify_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_MACdFlows_To_Add, new_create_dissector_handle(dissect_EDCH_MACdFlows_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_MACdFlows_To_Delete, new_create_dissector_handle(dissect_EDCH_MACdFlows_To_Delete_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDPCH_Information_RLReconfRequest_FDD, new_create_dissector_handle(dissect_EDPCH_Information_RLReconfRequest_FDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_F_DPCH_Information_RL_ReconfPrepFDD, new_create_dissector_handle(dissect_F_DPCH_Information_RL_ReconfPrepFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Fast_Reconfiguration_Mode, new_create_dissector_handle(dissect_Fast_Reconfiguration_Mode_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CPC_Information, new_create_dissector_handle(dissect_CPC_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_TPC_UplinkStepSize_InformationAdd_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_TPC_UplinkStepSize_InformationModify_LCR_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_TPC_DownlinkStepSize_InformationAdd_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_TPC_DownlinkStepSize_InformationModify_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_TDD_TPC_DownlinkStepSize_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PrimaryCCPCH_RSCP_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_TimeSlot_ISCP_Info_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_ISCP_LCR_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_Information_RL_ReconfPrepTDD, new_create_dissector_handle(dissect_RL_Information_RL_ReconfPrepTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_Information_Reconfig_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_768_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_768_Information_Reconfig_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_LCR_Information_Reconfig, new_create_dissector_handle(dissect_E_DCH_LCR_Information_Reconfig_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_PowerBalancing_UpdatedIndicator, new_create_dissector_handle(dissect_DL_PowerBalancing_UpdatedIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Secondary_CPICH_Information_Change, new_create_dissector_handle(dissect_Secondary_CPICH_Information_Change_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Fast_Reconfiguration_Permission, new_create_dissector_handle(dissect_Fast_Reconfiguration_Permission_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_secondary_LCR_CCPCH_Info_TDD, new_create_dissector_handle(dissect_Secondary_LCR_CCPCH_Info_TDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_secondary_CCPCH_Info_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_Secondary_CCPCH_Info_TDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_UL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RxTimingDeviationForTAext, new_create_dissector_handle(dissect_RxTimingDeviationForTAext_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_UL_DPCH_TimeSlotFormatModifyItem_LCR_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_TDD_UL_DPCH_TimeSlotFormat_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Maximum_DL_Power_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CCTrCH_Minimum_DL_Power_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_DL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768, new_create_dissector_handle(dissect_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TDD_DL_DPCH_TimeSlotFormatModifyItem_LCR_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_TDD_DL_DPCH_TimeSlotFormat_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Maximum_DL_Power_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Minimum_DL_Power_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_DL_Power_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Multiple_RL_InformationResponse_RL_ReconfReadyTDD, new_create_dissector_handle(dissect_Multiple_RL_InformationResponse_RL_ReconfReadyTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_ReconfigurationRequestFDD_RL_InformationList, new_create_dissector_handle(dissect_RL_ReconfigurationRequestFDD_RL_InformationList_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_ReferencePowerInformation, new_create_dissector_handle(dissect_DL_ReferencePowerInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_Information_to_Modify_Unsynchronised, new_create_dissector_handle(dissect_HSDSCH_Information_to_Modify_Unsynchronised_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_ReconfigurationRequestTDD_RL_Information, new_create_dissector_handle(dissect_Multiple_RL_ReconfigurationRequestTDD_RL_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_CCTrCH_InformationList_RL_ReconfRspTDD, new_create_dissector_handle(dissect_DL_CCTrCH_InformationList_RL_ReconfRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RL_ReconfigurationResponseTDD_RL_Information, new_create_dissector_handle(dissect_Multiple_RL_InformationResponse_RL_ReconfRspTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd, new_create_dissector_handle(dissect_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_timeSlot_ISCP_LCR_List_DL_PC_Rqst_TDD, new_create_dissector_handle(dissect_DL_TimeSlot_ISCP_LCR_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PrimCCPCH_RSCP_DL_PC_RqstTDD, new_create_dissector_handle(dissect_PrimaryCCPCH_RSCP_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UL_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_UL_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PLCCH_Information_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_PLCCHinformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, new_create_dissector_handle(dissect_DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_Timeslot_InformationList_PhyChReconfRqstTDD768, new_create_dissector_handle(dissect_DL_Timeslot_InformationList_PhyChReconfRqstTDD768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_MacdFlowSpecificInformationList_RL_CongestInd, new_create_dissector_handle(dissect_EDCH_MacdFlowSpecificInformationList_RL_CongestInd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CommonTransportChannelResourcesInitialisationNotRequired, new_create_dissector_handle(dissect_CommonTransportChannelResourcesInitialisationNotRequired_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Active_MBMS_Bearer_ServiceFDD, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Inter_Frequency_Cell_List, new_create_dissector_handle(dissect_Inter_Frequency_Cell_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Active_MBMS_Bearer_ServiceTDD, new_create_dissector_handle(dissect_Active_MBMS_Bearer_Service_ListTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RxTimingDeviationForTA768, new_create_dissector_handle(dissect_RxTimingDeviationForTA768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_URA_ID, new_create_dissector_handle(dissect_URA_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Old_URA_ID, new_create_dissector_handle(dissect_URA_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SRNC_ID, new_create_dissector_handle(dissect_RNC_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_Info_DM_Rqst, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DPCH_ID768_DM_Rqst, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_PartialReportingIndicator, new_create_dissector_handle(dissect_PartialReportingIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MeasurementRecoveryBehavior, new_create_dissector_handle(dissect_MeasurementRecoveryBehavior_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_AlternativeFormatReportingIndicator, new_create_dissector_handle(dissect_AlternativeFormatReportingIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_Info_DM, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multiple_DedicatedMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multiple_HSSICHMeasurementValueList_TDD_DM_Rsp, new_create_dissector_handle(dissect_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp, new_create_dissector_handle(dissect_Multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DPCH_ID768_DM_Rsp, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MeasurementRecoverySupportIndicator, new_create_dissector_handle(dissect_MeasurementRecoverySupportIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DedicatedMeasurementObjectType_DM_Fail, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Fail_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_Info_DM_Rprt, new_create_dissector_handle(dissect_HS_SICH_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DPCH_ID768_DM_Rprt, new_create_dissector_handle(dissect_DPCH_ID768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MeasurementRecoveryReportingIndicator, new_create_dissector_handle(dissect_MeasurementRecoveryReportingIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DedicatedMeasurementObjectType_DM_Fail_Ind, new_create_dissector_handle(dissect_DedicatedMeasurementObjectType_DM_Fail_Ind_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Enhanced_FACH_Support_Indicator, new_create_dissector_handle(dissect_Enhanced_FACH_Support_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_C_ID, new_create_dissector_handle(dissect_C_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Enhanced_FACH_Information_ResponseFDD, new_create_dissector_handle(dissect_Enhanced_FACH_Information_ResponseFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_S_RNTI, new_create_dissector_handle(dissect_S_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_D_RNTI, new_create_dissector_handle(dissect_D_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_FDD_Update_Information, new_create_dissector_handle(dissect_E_DCH_FDD_Update_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UEMeasurementTimeslotInfo768, new_create_dissector_handle(dissect_UEMeasurementTimeslotInfo768_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Ext_Reference_E_TFCI_PO, new_create_dissector_handle(dissect_Ext_Reference_E_TFCI_PO_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Ext_Max_Bits_MACe_PDU_non_scheduled, new_create_dissector_handle(dissect_Ext_Max_Bits_MACe_PDU_non_scheduled_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HARQ_MemoryPartitioningInfoExtForMIMO, new_create_dissector_handle(dissect_HARQ_MemoryPartitioningInfoExtForMIMO_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_MIMO_ActivationIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_MIMO_Mode_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_N_M_Ratio, new_create_dissector_handle(dissect_MIMO_N_M_Ratio_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TransportBearerNotSetupIndicator, new_create_dissector_handle(dissect_TransportBearerNotSetupIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TransportBearerNotRequestedIndicator, new_create_dissector_handle(dissect_TransportBearerNotRequestedIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UARFCNforNt, new_create_dissector_handle(dissect_UARFCN_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_LCRTDD_uplink_Physical_Channel_Capability, new_create_dissector_handle(dissect_LCRTDD_Uplink_Physical_Channel_Capability_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_number_Of_Supported_Carriers, new_create_dissector_handle(dissect_Number_Of_Supported_Carriers_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_SIRTarget, new_create_dissector_handle(dissect_UL_SIR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_TPC_StepSize, new_create_dissector_handle(dissect_TDD_TPC_UplinkStepSize_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_tSN_Length, new_create_dissector_handle(dissect_TSN_Length_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_SICH_ID_Extension, new_create_dissector_handle(dissect_HS_SICH_ID_Extension_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSSICH_Info_DM_Rqst_Extension, new_create_dissector_handle(dissect_HSSICH_Info_DM_Rqst_Extension_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multipleFreq_HSPDSCH_InformationList_ResponseTDDLCR, new_create_dissector_handle(dissect_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_multicarrier_number, new_create_dissector_handle(dissect_Multicarrier_Number_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UPPCHPositionLCR, new_create_dissector_handle(dissect_UPPCHPositionLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UpPCH_InformationList_LCRTDD, new_create_dissector_handle(dissect_UpPCH_InformationList_LCRTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UpPCH_InformationItem_LCRTDD, new_create_dissector_handle(dissect_UpPCH_InformationItem_LCRTDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Multiple_PLMN_List, new_create_dissector_handle(dissect_Multiple_PLMN_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_Capabilities_Info, new_create_dissector_handle(dissect_UE_Capabilities_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_FrameOffset, new_create_dissector_handle(dissect_FrameOffset_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_ChipOffset, new_create_dissector_handle(dissect_ChipOffset_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Enhanced_PCH_Capability, new_create_dissector_handle(dissect_Enhanced_PCH_Capability_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SixteenQAM_UL_Operation_Indicator, new_create_dissector_handle(dissect_SixteenQAM_UL_Operation_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_TFCI_Boost_Information, new_create_dissector_handle(dissect_E_TFCI_Boost_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SixtyfourQAM_UsageAllowedIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_UsageAllowedIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_SixtyfourQAM_DL_UsageIndicator, new_create_dissector_handle(dissect_SixtyfourQAM_DL_UsageIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Default_Serving_Grant_in_DTX_Cycle2, new_create_dissector_handle(dissect_E_Serving_Grant_Value_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DPDCH_PowerInterpolation, new_create_dissector_handle(dissect_E_DPDCH_PowerInterpolation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Extended_E_DCH_LCRTDD_PhysicalLayerCategory, new_create_dissector_handle(dissect_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_MACdPDUSizeFormat, new_create_dissector_handle(dissect_E_DCH_MACdPDUSizeFormat_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Continuous_Packet_Connectivity_HS_SCCH_Less_Deactivate_Indicator, new_create_dissector_handle(dissect_Continuous_Packet_Connectivity_HS_SCCH_less_Deactivate_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_DL_Control_Channel_Change_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Change_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_DL_Control_Channel_Grant_Information, new_create_dissector_handle(dissect_E_DCH_DL_Control_Channel_Grant_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MaximumNumber_Of_Retransmission_For_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_MaxNr_Retransmissions_EDCH_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_RetransmissionTimer_For_SchedulingInfo_LCRTDD, new_create_dissector_handle(dissect_E_DCH_MACdFlow_Retransmission_Timer_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_PUCH_PowerControlGAP, new_create_dissector_handle(dissect_ControlGAP_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_with_enhanced_HS_SCCH_support_indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_TBSizeTableIndicator, new_create_dissector_handle(dissect_HSDSCH_TBSizeTableIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DGANSS_Corrections_Req, new_create_dissector_handle(dissect_DGANSS_Corrections_Req_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_AGCH_Table_Choice, new_create_dissector_handle(dissect_E_AGCH_Table_Choice_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RANAP_EnhancedRelocationInformationRequest, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationRequest_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_RANAP_EnhancedRelocationInformationResponse, new_create_dissector_handle(dissect_RANAP_EnhancedRelocationInformationResponse_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Common_EDCH_MAC_d_Flow_Specific_InformationFDD, new_create_dissector_handle(dissect_Common_EDCH_MAC_d_Flow_Specific_InformationFDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Common_EDCH_Support_Indicator, new_create_dissector_handle(dissect_Common_EDCH_Support_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_RNTI, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_Released_CN_Domain, new_create_dissector_handle(dissect_Released_CN_Domain_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rprt, new_create_dissector_handle(dissect_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Cell_InfEx_Rqst, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rqst_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Cell_InfEx_Rsp, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rsp_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBMS_Cell_InfEx_Rprt, new_create_dissector_handle(dissect_MBMS_Cell_InfEx_Rprt_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Counting_Information, new_create_dissector_handle(dissect_Counting_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Transmission_Mode_Information, new_create_dissector_handle(dissect_Transmission_Mode_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MBMS_Neighbouring_Cell_Information, new_create_dissector_handle(dissect_MBMS_Neighbouring_Cell_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MBMS_RLC_Sequence_Number_Information, new_create_dissector_handle(dissect_MBMS_RLC_Sequence_Number_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RLC_Sequence_Number, new_create_dissector_handle(dissect_RLC_Sequence_Number_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Neighbouring_E_UTRA_CellInformation, new_create_dissector_handle(dissect_Neighbouring_E_UTRA_CellInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBSFN_Cluster_Identity, new_create_dissector_handle(dissect_MBSFN_Cluster_Identity_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MCCH_Configuration_Info, new_create_dissector_handle(dissect_MCCH_Configuration_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MCCH_Message_List, new_create_dissector_handle(dissect_MCCH_Message_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MBSFN_Scheduling_Transmission_Time_Interval_Info_List, new_create_dissector_handle(dissect_MBSFN_Scheduling_Transmission_Time_Interval_Info_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Time_ID, new_create_dissector_handle(dissect_GANSS_Time_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_AddIonoModelReq, new_create_dissector_handle(dissect_GANSS_AddIonoModelReq_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_EarthOrientParaReq, new_create_dissector_handle(dissect_GANSS_EarthOrientParaReq_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_AddNavigationModelsReq, new_create_dissector_handle(dissect_GANSS_AddNavigationModelsReq_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_AddUTCModelsReq, new_create_dissector_handle(dissect_GANSS_AddUTCModelsReq_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_AuxInfoReq, new_create_dissector_handle(dissect_GANSS_AuxInfoReq_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_SBAS_ID, new_create_dissector_handle(dissect_GANSS_SBAS_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_ID, new_create_dissector_handle(dissect_GANSS_ID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Additional_Ionospheric_Model, new_create_dissector_handle(dissect_GANSS_Additional_Ionospheric_Model_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Earth_Orientation_Parameters, new_create_dissector_handle(dissect_GANSS_Earth_Orientation_Parameters_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Additional_Time_Models, new_create_dissector_handle(dissect_GANSS_Additional_Time_Models_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Additional_Navigation_Models, new_create_dissector_handle(dissect_GANSS_Additional_Navigation_Models_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Additional_UTC_Models, new_create_dissector_handle(dissect_GANSS_Additional_UTC_Models_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_GANSS_Auxiliary_Information, new_create_dissector_handle(dissect_GANSS_Auxiliary_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MinimumReducedE_DPDCH_GainFactor, new_create_dissector_handle(dissect_MinimumReducedE_DPDCH_GainFactor_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Enhanced_FACH_Information_ResponseLCR, new_create_dissector_handle(dissect_Enhanced_FACH_Information_ResponseLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Common_EDCH_MAC_d_Flow_Specific_InformationLCR, new_create_dissector_handle(dissect_Common_EDCH_MAC_d_Flow_Specific_InformationLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_PreconfigurationSetup, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationSetup_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_PreconfigurationInfo, new_create_dissector_handle(dissect_HSDSCH_PreconfigurationInfo_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_NoOfTargetCellHS_SCCH_Order, new_create_dissector_handle(dissect_NoOfTargetCellHS_SCCH_Order_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EnhancedHSServingCC_Abort, new_create_dissector_handle(dissect_EnhancedHSServingCC_Abort_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_RL_Setup, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Setup_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_Response_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_RL_Addition, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Addition_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Change_Information_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_Change_Information_Response_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Reconf_Req_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_RL_Reconf_Response, new_create_dissector_handle(dissect_Additional_HS_Cell_RL_Reconf_Response_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_HS_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_HS_Cell_Information_RL_Param_Upd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Secondary_Serving_Cell_List, new_create_dissector_handle(dissect_Secondary_Serving_Cell_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MultiCarrier_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_LCRTDD_HSDSCH_Physical_Layer_Category_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_IdleIntervalInformation, new_create_dissector_handle(dissect_IdleIntervalInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_NeedforIdleInterval, new_create_dissector_handle(dissect_NeedforIdleInterval_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_IdleIntervalConfigurationIndicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_ContinuousPacketConnectivity_DRX_InformationLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_InformationLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_ContinuousPacketConnectivity_DRX_Information_ResponseLCR, new_create_dissector_handle(dissect_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_AGCH_UE_Inactivity_Monitor_Threshold, new_create_dissector_handle(dissect_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CPC_InformationLCR, new_create_dissector_handle(dissect_CPC_InformationLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_LCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR, new_create_dissector_handle(dissect_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_SFMode_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_SFMode_Supported_For_HSPDSCHDualStream, new_create_dissector_handle(dissect_MIMO_SFMode_For_HSPDSCHDualStream_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MIMO_ReferenceSignal_InformationListLCR, new_create_dissector_handle(dissect_MIMO_ReferenceSignal_InformationListLCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GANSS_alm_keplerianNAVAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianNAVAlmanac_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GANSS_alm_keplerianReducedAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianReducedAlmanac_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GANSS_alm_keplerianMidiAlmanac, new_create_dissector_handle(dissect_GANSS_alm_keplerianMidiAlmanac_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GANSS_alm_keplerianGLONASS, new_create_dissector_handle(dissect_GANSS_alm_keplerianGLONASS_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_GANSS_alm_ecefSBASAlmanac, new_create_dissector_handle(dissect_GANSS_alm_ecefSBASAlmanac_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DL_RLC_PDU_Size_Format, new_create_dissector_handle(dissect_DL_RLC_PDU_Size_Format_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_MACes_Maximum_Bitrate_LCR, new_create_dissector_handle(dissect_MACes_Maximum_Bitrate_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Single_Stream_MIMO_ActivationIndicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_ActivationIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Single_Stream_MIMO_Mode_Indicator, new_create_dissector_handle(dissect_Single_Stream_MIMO_Mode_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Dual_Band_Secondary_Serving_Cell_List, new_create_dissector_handle(dissect_Secondary_Serving_Cell_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_AggregateMaximumBitRate, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_power_offset_for_S_CPICH_for_MIMO, new_create_dissector_handle(dissect_PowerOffsetForSecondaryCPICHforMIMO_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_power_offset_for_S_CPICH_for_MIMO_Request_Indicator, new_create_dissector_handle(dissect_PowerOffsetForSecondaryCPICHforMIMORequestIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_SupportIndicatorExtension, new_create_dissector_handle(dissect_UE_SupportIndicatorExtension_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_ActivationInformation, new_create_dissector_handle(dissect_ActivationInformation_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellPortionLCRID, new_create_dissector_handle(dissect_CellPortionLCRID_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Setup_Req, new_create_dissector_handle(dissect_Additional_EDCH_Setup_Info_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_Response, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Add_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Add_Req_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_Response_RLAdd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLAddList_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Prep, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Reconf_Req, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_RL_Param_Upd, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_RL_Param_Upd_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Preconfiguration_Information, new_create_dissector_handle(dissect_Additional_EDCH_Preconfiguration_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MulticellEDCH_Information, new_create_dissector_handle(dissect_MulticellEDCH_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Additional_EDCH_Cell_Information_ResponseRLReconf, new_create_dissector_handle(dissect_Additional_EDCH_Cell_Information_Response_RLReconf_List_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_EDCH_Indicator, new_create_dissector_handle(dissect_NULL_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DiversityMode, new_create_dissector_handle(dissect_DiversityMode_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TransmitDiversityIndicator, new_create_dissector_handle(dissect_TransmitDiversityIndicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_NonCellSpecificTxDiversity, new_create_dissector_handle(dissect_NonCellSpecificTxDiversity_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_CellCapabilityContainerExtension_FDD, new_create_dissector_handle(dissect_CellCapabilityContainerExtension_FDD_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_HSDSCH_Physical_Layer_Category, new_create_dissector_handle(dissect_HSDSCH_Physical_Layer_Category_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_E_RNTI_For_FACH, new_create_dissector_handle(dissect_E_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_H_RNTI_For_FACH, new_create_dissector_handle(dissect_HSDSCH_RNTI_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_RNTI_Allocation_Indicator, new_create_dissector_handle(dissect_RNTI_Allocation_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_AggregateMaximumBitRate_Enforcement_Indicator, new_create_dissector_handle(dissect_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DCH_MeasurementOccasion_Information, new_create_dissector_handle(dissect_DCH_MeasurementOccasion_Information_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DCH_MeasurementType_Indicator, new_create_dissector_handle(dissect_DCH_MeasurementType_Indicator_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_Out_of_Sychronization_Window, new_create_dissector_handle(dissect_Out_of_Sychronization_Window_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.ies", id_MulticellEDCH_RL_SpecificInformation, new_create_dissector_handle(dissect_MulticellEDCH_RL_SpecificInformationItemIEs_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_TS0_HS_PDSCH_Indication_LCR, new_create_dissector_handle(dissect_TS0_HS_PDSCH_Indication_LCR_PDU, proto_rnsap));
+  dissector_add_uint("rnsap.extension", id_UE_TS0_CapabilityLCR, new_create_dissector_handle(dissect_UE_TS0_CapabilityLCR_PDU, proto_rnsap));
   dissector_add_string("rnsap.proc.imsg", "id-radioLinkSetup/fdd", new_create_dissector_handle(dissect_RadioLinkSetupRequestFDD_PDU, proto_rnsap));
   dissector_add_string("rnsap.proc.sout", "id-radioLinkSetup/fdd", new_create_dissector_handle(dissect_RadioLinkSetupResponseFDD_PDU, proto_rnsap));
   dissector_add_string("rnsap.proc.uout", "id-radioLinkSetup/fdd", new_create_dissector_handle(dissect_RadioLinkSetupFailureFDD_PDU, proto_rnsap));
diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c
index 5ea20e0239..5b69b7cda4 100644
--- a/epan/dissectors/packet-roofnet.c
+++ b/epan/dissectors/packet-roofnet.c
@@ -361,8 +361,8 @@ void proto_reg_handoff_roofnet(void)
   roofnet_handle = create_dissector_handle(dissect_roofnet, proto_roofnet);
   /* I did not put the type numbers in the ethertypes.h as they only are
    * experimental and not official */
-  dissector_add("ethertype", 0x0641, roofnet_handle);
-  dissector_add("ethertype", 0x0643, roofnet_handle);
-  dissector_add("ethertype", 0x0644, roofnet_handle);
-  dissector_add("ethertype", 0x0645, roofnet_handle);
+  dissector_add_uint("ethertype", 0x0641, roofnet_handle);
+  dissector_add_uint("ethertype", 0x0643, roofnet_handle);
+  dissector_add_uint("ethertype", 0x0644, roofnet_handle);
+  dissector_add_uint("ethertype", 0x0645, roofnet_handle);
 }
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index f8710f321f..7cffed915f 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3840,9 +3840,9 @@ proto_reg_handoff_rpc(void)
 	   to match some port for which we have a dissector)
 	*/
 	rpc_tcp_handle = find_dissector("rpc-tcp");
-	dissector_add("tcp.port", 111, rpc_tcp_handle);
+	dissector_add_uint("tcp.port", 111, rpc_tcp_handle);
 	rpc_handle = find_dissector("rpc");
-	dissector_add("udp.port", 111, rpc_handle);
+	dissector_add_uint("udp.port", 111, rpc_handle);
 
 	heur_dissector_add("tcp", dissect_rpc_tcp_heur, proto_rpc);
 	heur_dissector_add("udp", dissect_rpc_heur, proto_rpc);
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index fce5c69b36..beab0cba14 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -772,7 +772,7 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree,
 
   new_tvb = tvb_new_subset (tvb, offset, caplen, tvb_length_remaining (tvb, offset));
   if (decode_content && linktype != WTAP_ENCAP_UNKNOWN) {
-    dissector_try_port(wtap_encap_dissector_table, linktype, new_tvb, pinfo, top_tree);
+    dissector_try_uint(wtap_encap_dissector_table, linktype, new_tvb, pinfo, top_tree);
 
     if (!info_added) {
       /* Only indicate when not added before */
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index bbb5723756..4e9273c734 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -415,5 +415,5 @@ proto_reg_handoff_rpl(void)
 
 	data_handle = find_dissector("data");
 	rpl_handle = find_dissector("rpl");
-	dissector_add("llc.dsap", SAP_RPL, rpl_handle);
+	dissector_add_uint("llc.dsap", SAP_RPL, rpl_handle);
 }
diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c
index acbc10b9b4..22a3d7712b 100644
--- a/epan/dissectors/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
@@ -89,7 +89,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			offset = next_offset;
 		}
 
-		if (pinfo->match_port == pinfo->destport) {
+		if (pinfo->match_uint == pinfo->destport) {
 			hidden_item = proto_tree_add_boolean(rsh_tree,
 			    hf_rsh_request, tvb, 0, 0, 1);
                 } else {
@@ -130,5 +130,5 @@ proto_reg_handoff_rsh(void)
 	dissector_handle_t rsh_handle;
 
 	rsh_handle = create_dissector_handle(dissect_rsh, proto_rsh);
-	dissector_add("tcp.port", TCP_PORT_RSH, rsh_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_RSH, rsh_handle);
 }
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index e497bae866..bf83f6f3ab 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -3531,7 +3531,7 @@ proto_reg_handoff_rsl(void)
 	dissector_handle_t rsl_handle;
 
 	rsl_handle = create_dissector_handle(dissect_rsl, proto_rsl);
-	dissector_add("lapd.gsm.sapi", LAPD_GSM_SAPI_RA_SIG_PROC, rsl_handle);
+	dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_RA_SIG_PROC, rsl_handle);
 
 	gsm_a_ccch_handle = find_dissector("gsm_a_ccch");
 	gsm_a_dtap_handle = find_dissector("gsm_a_dtap");
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 29b2999bdf..a118fdbd44 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -6267,8 +6267,8 @@ proto_reg_handoff_rsvp(void)
     dissector_handle_t rsvp_handle;
 
     rsvp_handle = create_dissector_handle(dissect_rsvp, proto_rsvp);
-    dissector_add("ip.proto", IP_PROTO_RSVP, rsvp_handle);
-    dissector_add("ip.proto", IP_PROTO_RSVPE2EI, rsvp_handle);
-    dissector_add("udp.port", UDP_PORT_PRSVP, rsvp_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_RSVP, rsvp_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_RSVPE2EI, rsvp_handle);
+    dissector_add_uint("udp.port", UDP_PORT_PRSVP, rsvp_handle);
     rsvp_tap = register_tap("rsvp");
 }
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 7e6217893f..de50a76ce2 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -320,9 +320,9 @@ proto_reg_handoff_rsync(void)
         rsync_handle = create_dissector_handle(dissect_rsync, proto_rsync);
         initialized = TRUE;
     } else {
-        dissector_delete("tcp.port", saved_rsync_tcp_port, rsync_handle);
+        dissector_delete_uint("tcp.port", saved_rsync_tcp_port, rsync_handle);
     }
 
-    dissector_add("tcp.port", glb_rsync_tcp_port, rsync_handle);
+    dissector_add_uint("tcp.port", glb_rsync_tcp_port, rsync_handle);
     saved_rsync_tcp_port = glb_rsync_tcp_port;
 }
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 66c79ab347..29bbbf2df2 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -1743,7 +1743,7 @@ dissect_rtmpt_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          *  likely easily confused.
          */
 
-        cdir = pinfo->srcport==pinfo->match_port;
+        cdir = pinfo->srcport==pinfo->match_uint;
 
         if (cdir) {
                 conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, 0, pinfo->srcport, 0);
@@ -2056,7 +2056,7 @@ proto_reg_handoff_rtmpt(void)
 /*	heur_dissector_add("tcp", dissect_rtmpt_heur, proto_rtmpt); */
 	rtmpt_tcp_handle = create_dissector_handle(dissect_rtmpt_tcp, proto_rtmpt);
 /*	dissector_add_handle("tcp.port", rtmpt_tcp_handle); */
-	dissector_add("tcp.port", RTMP_PORT, rtmpt_tcp_handle);
+	dissector_add_uint("tcp.port", RTMP_PORT, rtmpt_tcp_handle);
 
 	rtmpt_http_handle = create_dissector_handle(dissect_rtmpt_http, proto_rtmpt);
 	dissector_add_string("media_type", "application/x-fcs", rtmpt_http_handle);
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 96ae14e5e4..c1eff8458a 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -573,11 +573,11 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   if (ver == 1) {
     type_str = match_strval(type, rtmac_type_vals);
     if (!type_str) {
-      dissector = dissector_get_port_handle(ethertype_table, type);
+      dissector = dissector_get_uint_handle(ethertype_table, type);
     }
   } else {
     if (flags & RTMAC_FLAG_TUNNEL) {
-      dissector = dissector_get_port_handle(ethertype_table, type);
+      dissector = dissector_get_uint_handle(ethertype_table, type);
     }
   }
   if (!dissector)
@@ -1338,7 +1338,7 @@ proto_reg_handoff_rtmac(void) {
   dissector_handle_t rtmac_handle;
 
   rtmac_handle = create_dissector_handle(dissect_rtmac, proto_rtmac);
-  dissector_add("ethertype", ETHERTYPE_RTMAC, rtmac_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_RTMAC, rtmac_handle);
   ethertype_table = find_dissector_table("ethertype");
 }
 
@@ -1348,5 +1348,5 @@ proto_reg_handoff_rtcfg(void) {
 
   data_handle = find_dissector("data");
   rtcfg_handle = create_dissector_handle(dissect_rtcfg, proto_rtcfg);
-  dissector_add("ethertype", ETHERTYPE_RTCFG, rtcfg_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_RTCFG, rtcfg_handle);
 }
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 620756717a..9e37214baf 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -273,8 +273,8 @@ proto_reg_handoff_rtp_events(void)
 		rtp_events_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("rtp.pt", saved_payload_type_value, rtp_events_handle);
-		dissector_delete("rtp.pt", saved_cisco_nse_pt_value, rtp_events_handle);
+		dissector_delete_uint("rtp.pt", saved_payload_type_value, rtp_events_handle);
+		dissector_delete_uint("rtp.pt", saved_cisco_nse_pt_value, rtp_events_handle);
 	}
 
 	saved_payload_type_value = rtp_event_payload_type_value;
@@ -282,6 +282,6 @@ proto_reg_handoff_rtp_events(void)
 	saved_cisco_nse_pt_value = cisco_nse_pt_value;
 	/* cisco_nse_pt_value is set from preferences */
 
-	dissector_add("rtp.pt", saved_payload_type_value, rtp_events_handle);
-	dissector_add("rtp.pt", saved_cisco_nse_pt_value, rtp_events_handle);
+	dissector_add_uint("rtp.pt", saved_payload_type_value, rtp_events_handle);
+	dissector_add_uint("rtp.pt", saved_cisco_nse_pt_value, rtp_events_handle);
 }
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 048d994492..576322edc4 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -819,7 +819,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree,
 	}
 
 	/* if we don't found, it is static OR could be set static from the preferences */
-	if (!found_match && !dissector_try_port(rtp_pt_dissector_table, payload_type, newtvb, pinfo, tree))
+	if (!found_match && !dissector_try_uint(rtp_pt_dissector_table, payload_type, newtvb, pinfo, tree))
 		proto_tree_add_item( rtp_tree, hf_rtp_data, newtvb, 0, -1, FALSE );
 
 }
@@ -1712,12 +1712,12 @@ proto_reg_handoff_pkt_ccc(void)
 		initialized = TRUE;
 	} else {
 		if (saved_pkt_ccc_udp_port != 0) {
-			dissector_delete("udp.port", saved_pkt_ccc_udp_port, pkt_ccc_handle);
+			dissector_delete_uint("udp.port", saved_pkt_ccc_udp_port, pkt_ccc_handle);
 		}
 	}
 
 	if (global_pkt_ccc_udp_port != 0) {
-		dissector_add("udp.port", global_pkt_ccc_udp_port, pkt_ccc_handle);
+		dissector_add_uint("udp.port", global_pkt_ccc_udp_port, pkt_ccc_handle);
 	}
 	saved_pkt_ccc_udp_port = global_pkt_ccc_udp_port;
 }
@@ -2190,9 +2190,9 @@ proto_reg_handoff_rtp(void)
 
 		rtp_prefs_initialized = TRUE;
 	} else {
-		dissector_delete("rtp.pt", rtp_saved_rfc2198_pt, rtp_rfc2198_handle);
+		dissector_delete_uint("rtp.pt", rtp_saved_rfc2198_pt, rtp_rfc2198_handle);
 	}
-	dissector_add("rtp.pt", rtp_rfc2198_pt, rtp_rfc2198_handle);
+	dissector_add_uint("rtp.pt", rtp_rfc2198_pt, rtp_rfc2198_handle);
 	rtp_saved_rfc2198_pt = rtp_rfc2198_pt;
 }
 
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 220cf04210..8463c7b16f 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -1324,12 +1324,12 @@ proto_reg_handoff_rtsp(void)
 		rtsp_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", saved_rtsp_tcp_port, rtsp_handle);
-		dissector_delete("tcp.port", saved_rtsp_tcp_alternate_port, rtsp_handle);
+		dissector_delete_uint("tcp.port", saved_rtsp_tcp_port, rtsp_handle);
+		dissector_delete_uint("tcp.port", saved_rtsp_tcp_alternate_port, rtsp_handle);
 	}
 	/* Set our port number for future use */
-	dissector_add("tcp.port", global_rtsp_tcp_port, rtsp_handle);
-	dissector_add("tcp.port", global_rtsp_tcp_alternate_port, rtsp_handle);
+	dissector_add_uint("tcp.port", global_rtsp_tcp_port, rtsp_handle);
+	dissector_add_uint("tcp.port", global_rtsp_tcp_alternate_port, rtsp_handle);
 
 	saved_rtsp_tcp_port = global_rtsp_tcp_port;
 	saved_rtsp_tcp_alternate_port = global_rtsp_tcp_alternate_port;
diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c
index 5a77f12274..8825263971 100644
--- a/epan/dissectors/packet-rua.c
+++ b/epan/dissectors/packet-rua.c
@@ -1363,27 +1363,27 @@ static void dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -1767,34 +1767,34 @@ proto_reg_handoff_rua(void)
         if (!initialized) {
                 rua_handle = find_dissector("rua");
                 ranap_handle = find_dissector("ranap");
-                dissector_add("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
+                dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
                 initialized = TRUE;
 
 /*--- Included file: packet-rua-dis-tab.c ---*/
 #line 1 "packet-rua-dis-tab.c"
-  dissector_add("rua.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_rua));
-  dissector_add("rua.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rua));
-  dissector_add("rua.ies", id_Context_ID, new_create_dissector_handle(dissect_Context_ID_PDU, proto_rua));
-  dissector_add("rua.ies", id_RANAP_Message, new_create_dissector_handle(dissect_RANAP_Message_PDU, proto_rua));
-  dissector_add("rua.ies", id_IntraDomainNasNodeSelector, new_create_dissector_handle(dissect_IntraDomainNasNodeSelector_PDU, proto_rua));
-  dissector_add("rua.ies", id_Establishment_Cause, new_create_dissector_handle(dissect_Establishment_Cause_PDU, proto_rua));
-  dissector_add("rua.ies", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_rua));
-  dissector_add("rua.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_Connect, new_create_dissector_handle(dissect_Connect_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_DirectTransfer, new_create_dissector_handle(dissect_DirectTransfer_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_Disconnect, new_create_dissector_handle(dissect_Disconnect_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_ConnectionlessTransfer, new_create_dissector_handle(dissect_ConnectionlessTransfer_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_rua));
-  dissector_add("rua.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_Context_ID, new_create_dissector_handle(dissect_Context_ID_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_RANAP_Message, new_create_dissector_handle(dissect_RANAP_Message_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_IntraDomainNasNodeSelector, new_create_dissector_handle(dissect_IntraDomainNasNodeSelector_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_Establishment_Cause, new_create_dissector_handle(dissect_Establishment_Cause_PDU, proto_rua));
+  dissector_add_uint("rua.ies", id_CN_DomainIndicator, new_create_dissector_handle(dissect_CN_DomainIndicator_PDU, proto_rua));
+  dissector_add_uint("rua.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_Connect, new_create_dissector_handle(dissect_Connect_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_DirectTransfer, new_create_dissector_handle(dissect_DirectTransfer_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_Disconnect, new_create_dissector_handle(dissect_Disconnect_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_ConnectionlessTransfer, new_create_dissector_handle(dissect_ConnectionlessTransfer_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_rua));
+  dissector_add_uint("rua.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_rua));
 
 
 /*--- End of included file: packet-rua-dis-tab.c ---*/
 #line 185 "packet-rua-template.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, rua_handle);
+                dissector_delete_uint("sctp.port", sctp_port, rua_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, rua_handle);
+        dissector_add_uint("sctp.port", sctp_port, rua_handle);
 }
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c
index 8cbde45172..86c0f79cf7 100644
--- a/epan/dissectors/packet-rudp.c
+++ b/epan/dissectors/packet-rudp.c
@@ -258,12 +258,12 @@ proto_reg_handoff_rudp(void) {
 		initialized = TRUE;
 	} else {
 		if (saved_udp_port != 0) {
-			dissector_delete("udp.port", saved_udp_port, rudp_handle);
+			dissector_delete_uint("udp.port", saved_udp_port, rudp_handle);
 		}
 	}
 
 	if (udp_port != 0) {
-		dissector_add("udp.port", udp_port, rudp_handle);
+		dissector_add_uint("udp.port", udp_port, rudp_handle);
 	}
 	saved_udp_port = udp_port;
 }
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index 2186dfb35d..5e3b915774 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -792,6 +792,6 @@ proto_reg_handoff_rx(void)
 	   are all used for various AFS services. */
 	rx_handle = new_create_dissector_handle(dissect_rx, proto_rx);
 	for (port = UDP_PORT_RX_LOW; port <= UDP_PORT_RX_HIGH; port++)
-		dissector_add("udp.port", port, rx_handle);
-	dissector_add("udp.port", UDP_PORT_RX_AFS_BACKUPS, rx_handle);
+		dissector_add_uint("udp.port", port, rx_handle);
+	dissector_add_uint("udp.port", UDP_PORT_RX_AFS_BACKUPS, rx_handle);
 }
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 1c09fbc55a..9e6a34eb84 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -7841,38 +7841,38 @@ static int dissect_S1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 /* Currently not used
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 */
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 
@@ -7905,222 +7905,222 @@ proto_reg_handoff_s1ap(void)
 	if (!Initialized) {
 		nas_eps_handle = find_dissector("nas-eps");
 		dissector_add_handle("sctp.port", s1ap_handle);   /* for "decode-as"  */
-		dissector_add("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
+		dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
 		Initialized=TRUE;
 
 /*--- Included file: packet-s1ap-dis-tab.c ---*/
 #line 1 "packet-s1ap-dis-tab.c"
-  dissector_add("s1ap.ies", id_MME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_HandoverType, new_create_dissector_handle(dissect_HandoverType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TargetID, new_create_dissector_handle(dissect_TargetID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_eNB_UE_S1AP_ID, new_create_dissector_handle(dissect_ENB_UE_S1AP_ID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABSubjecttoDataForwardingList, new_create_dissector_handle(dissect_E_RABSubjecttoDataForwardingList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABtoReleaseListHOCmd, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABDataForwardingItem, new_create_dissector_handle(dissect_E_RABDataForwardingItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABReleaseItemBearerRelComp, new_create_dissector_handle(dissect_E_RABReleaseItemBearerRelComp_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupListBearerSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupListBearerSUReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupItemBearerSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemBearerSUReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABAdmittedList, new_create_dissector_handle(dissect_E_RABAdmittedList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedToSetupListHOReqAck, new_create_dissector_handle(dissect_E_RABFailedtoSetupListHOReqAck_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABAdmittedItem, new_create_dissector_handle(dissect_E_RABAdmittedItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedtoSetupItemHOReqAck, new_create_dissector_handle(dissect_E_RABFailedToSetupItemHOReqAck_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSwitchedDLList, new_create_dissector_handle(dissect_E_RABToBeSwitchedDLList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSwitchedDLItem, new_create_dissector_handle(dissect_E_RABToBeSwitchedDLItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupListCtxtSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupListCtxtSUReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TraceActivation, new_create_dissector_handle(dissect_TraceActivation_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_NAS_PDU, new_create_dissector_handle(dissect_NAS_PDU_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupItemHOReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemHOReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABSetupListBearerSURes, new_create_dissector_handle(dissect_E_RABSetupListBearerSURes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedToSetupListBearerSURes, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeModifiedListBearerModReq, new_create_dissector_handle(dissect_E_RABToBeModifiedListBearerModReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABModifyListBearerModRes, new_create_dissector_handle(dissect_E_RABModifyListBearerModRes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedToModifyList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeReleasedList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedToReleaseList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABItem, new_create_dissector_handle(dissect_E_RABItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeModifiedItemBearerModReq, new_create_dissector_handle(dissect_E_RABToBeModifiedItemBearerModReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABModifyItemBearerModRes, new_create_dissector_handle(dissect_E_RABModifyItemBearerModRes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABSetupItemBearerSURes, new_create_dissector_handle(dissect_E_RABSetupItemBearerSURes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SecurityContext, new_create_dissector_handle(dissect_SecurityContext_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_HandoverRestrictionList, new_create_dissector_handle(dissect_HandoverRestrictionList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UEPagingID, new_create_dissector_handle(dissect_UEPagingID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_pagingDRX, new_create_dissector_handle(dissect_PagingDRX_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TAIList, new_create_dissector_handle(dissect_TAIList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TAIItem, new_create_dissector_handle(dissect_TAIItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABFailedToSetupListCtxtSURes, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABSetupItemCtxtSURes, new_create_dissector_handle(dissect_E_RABSetupItemCtxtSURes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABSetupListCtxtSURes, new_create_dissector_handle(dissect_E_RABSetupListCtxtSURes_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupItemCtxtSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemCtxtSUReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSetupListHOReq, new_create_dissector_handle(dissect_E_RABToBeSetupListHOReq_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Global_ENB_ID, new_create_dissector_handle(dissect_Global_ENB_ID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_eNBname, new_create_dissector_handle(dissect_ENBname_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_MMEname, new_create_dissector_handle(dissect_MMEname_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_ServedPLMNs, new_create_dissector_handle(dissect_ServedPLMNs_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SupportedTAs, new_create_dissector_handle(dissect_SupportedTAs_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_uEaggregateMaximumBitrate, new_create_dissector_handle(dissect_UEAggregateMaximumBitrate_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TAI, new_create_dissector_handle(dissect_TAI_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABReleaseListBearerRelComp, new_create_dissector_handle(dissect_E_RABReleaseListBearerRelComp_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000PDU, new_create_dissector_handle(dissect_Cdma2000PDU_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000RATType, new_create_dissector_handle(dissect_Cdma2000RATType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000SectorID, new_create_dissector_handle(dissect_Cdma2000SectorID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SecurityKey, new_create_dissector_handle(dissect_SecurityKey_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UERadioCapability, new_create_dissector_handle(dissect_UERadioCapability_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_GUMMEI_ID, new_create_dissector_handle(dissect_GUMMEI_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABInformationListItem, new_create_dissector_handle(dissect_E_RABInformationListItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Direct_Forwarding_Path_Availability, new_create_dissector_handle(dissect_Direct_Forwarding_Path_Availability_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UEIdentityIndexValue, new_create_dissector_handle(dissect_UEIdentityIndexValue_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000HOStatus, new_create_dissector_handle(dissect_Cdma2000HOStatus_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000HORequiredIndication, new_create_dissector_handle(dissect_Cdma2000HORequiredIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_RelativeMMECapacity, new_create_dissector_handle(dissect_RelativeMMECapacity_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SourceMME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_eNB_StatusTransfer_TransparentContainer, new_create_dissector_handle(dissect_s1ap_ENB_StatusTransfer_TransparentContainer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionItem, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_ResetType, new_create_dissector_handle(dissect_ResetType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionListResAck, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionListResAck_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSwitchedULItem, new_create_dissector_handle(dissect_E_RABToBeSwitchedULItem_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABToBeSwitchedULList, new_create_dissector_handle(dissect_E_RABToBeSwitchedULList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_S_TMSI, new_create_dissector_handle(dissect_S_TMSI_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000OneXRAND, new_create_dissector_handle(dissect_Cdma2000OneXRAND_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UE_S1AP_IDs, new_create_dissector_handle(dissect_UE_S1AP_IDs_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_EUTRAN_CGI, new_create_dissector_handle(dissect_EUTRAN_CGI_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_OverloadResponse, new_create_dissector_handle(dissect_OverloadResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_cdma2000OneXSRVCCInfo, new_create_dissector_handle(dissect_Cdma2000OneXSRVCCInfo_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_ServedGUMMEIs, new_create_dissector_handle(dissect_ServedGUMMEIs_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SubscriberProfileIDforRFP, new_create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_UESecurityCapabilities, new_create_dissector_handle(dissect_UESecurityCapabilities_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CSFallbackIndicator, new_create_dissector_handle(dissect_CSFallbackIndicator_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CNDomain, new_create_dissector_handle(dissect_CNDomain_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_E_RABReleasedList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_MessageIdentifier, new_create_dissector_handle(dissect_MessageIdentifier_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SerialNumber, new_create_dissector_handle(dissect_SerialNumber_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_WarningAreaList, new_create_dissector_handle(dissect_WarningAreaList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_RepetitionPeriod, new_create_dissector_handle(dissect_RepetitionPeriod_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_NumberofBroadcastRequest, new_create_dissector_handle(dissect_NumberofBroadcastRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_WarningType, new_create_dissector_handle(dissect_WarningType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_WarningSecurityInfo, new_create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_DataCodingScheme, new_create_dissector_handle(dissect_DataCodingScheme_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_WarningMessageContents, new_create_dissector_handle(dissect_WarningMessageContents_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_BroadcastCompletedAreaList, new_create_dissector_handle(dissect_BroadcastCompletedAreaList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Inter_SystemInformationTransferTypeEDT, new_create_dissector_handle(dissect_Inter_SystemInformationTransferType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Inter_SystemInformationTransferTypeMDT, new_create_dissector_handle(dissect_Inter_SystemInformationTransferType_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SRVCCHOIndication, new_create_dissector_handle(dissect_SRVCCHOIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CSG_IdList, new_create_dissector_handle(dissect_CSG_IdList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SONConfigurationTransferECT, new_create_dissector_handle(dissect_SONConfigurationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_SONConfigurationTransferMCT, new_create_dissector_handle(dissect_SONConfigurationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_TraceCollectionEntityIPAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_MSClassmark2, new_create_dissector_handle(dissect_MSClassmark2_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_MSClassmark3, new_create_dissector_handle(dissect_MSClassmark3_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_RRC_Establishment_Cause, new_create_dissector_handle(dissect_RRC_Establishment_Cause_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_NASSecurityParametersfromE_UTRAN, new_create_dissector_handle(dissect_NASSecurityParametersfromE_UTRAN_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_NASSecurityParameterstoE_UTRAN, new_create_dissector_handle(dissect_NASSecurityParameterstoE_UTRAN_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_DefaultPagingDRX, new_create_dissector_handle(dissect_PagingDRX_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Source_ToTarget_TransparentContainer_Secondary, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Target_ToSource_TransparentContainer_Secondary, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_EUTRANRoundTripDelayEstimationInfo, new_create_dissector_handle(dissect_EUTRANRoundTripDelayEstimationInfo_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_BroadcastCancelledAreaList, new_create_dissector_handle(dissect_BroadcastCancelledAreaList_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_ConcurrentWarningMessageIndicator, new_create_dissector_handle(dissect_ConcurrentWarningMessageIndicator_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_ExtendedRepetitionPeriod, new_create_dissector_handle(dissect_ExtendedRepetitionPeriod_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CellAccessMode, new_create_dissector_handle(dissect_CellAccessMode_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_LPPa_PDU, new_create_dissector_handle(dissect_LPPa_PDU_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_Routing_ID, new_create_dissector_handle(dissect_Routing_ID_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_PS_ServiceNotAvailable, new_create_dissector_handle(dissect_PS_ServiceNotAvailable_PDU, proto_s1ap));
-  dissector_add("s1ap.extension", id_Data_Forwarding_Not_Possible, new_create_dissector_handle(dissect_Data_Forwarding_Not_Possible_PDU, proto_s1ap));
-  dissector_add("s1ap.extension", id_Time_Synchronization_Info, new_create_dissector_handle(dissect_TimeSynchronizationInfo_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverRequired_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverCommand_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_HandoverNotification, new_create_dissector_handle(dissect_HandoverNotify_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequestAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequestFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_E_RABSetup, new_create_dissector_handle(dissect_E_RABSetupRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_E_RABSetup, new_create_dissector_handle(dissect_E_RABSetupResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_E_RABModify, new_create_dissector_handle(dissect_E_RABModifyRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_E_RABModify, new_create_dissector_handle(dissect_E_RABModifyResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_E_RABRelease, new_create_dissector_handle(dissect_E_RABReleaseCommand_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_E_RABRelease, new_create_dissector_handle(dissect_E_RABReleaseResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_E_RABReleaseIndication, new_create_dissector_handle(dissect_E_RABReleaseIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_UEContextReleaseRequest, new_create_dissector_handle(dissect_UEContextReleaseRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_Paging, new_create_dissector_handle(dissect_Paging_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_downlinkNASTransport, new_create_dissector_handle(dissect_DownlinkNASTransport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_initialUEMessage, new_create_dissector_handle(dissect_InitialUEMessage_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_uplinkNASTransport, new_create_dissector_handle(dissect_UplinkNASTransport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_NASNonDeliveryIndication, new_create_dissector_handle(dissect_NASNonDeliveryIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_HandoverCancel, new_create_dissector_handle(dissect_HandoverCancel_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_HandoverCancel, new_create_dissector_handle(dissect_HandoverCancelAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_Reset, new_create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_S1Setup, new_create_dissector_handle(dissect_S1SetupRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_DownlinkS1cdma2000tunneling, new_create_dissector_handle(dissect_DownlinkS1cdma2000tunneling_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdate_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateAcknowledge_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_UplinkS1cdma2000tunneling, new_create_dissector_handle(dissect_UplinkS1cdma2000tunneling_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.uout", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationFailure_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_UECapabilityInfoIndication, new_create_dissector_handle(dissect_UECapabilityInfoIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_UEContextRelease, new_create_dissector_handle(dissect_UEContextReleaseCommand_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_UEContextRelease, new_create_dissector_handle(dissect_UEContextReleaseComplete_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_eNBStatusTransfer, new_create_dissector_handle(dissect_ENBStatusTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_MMEStatusTransfer, new_create_dissector_handle(dissect_MMEStatusTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_DeactivateTrace, new_create_dissector_handle(dissect_DeactivateTrace_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_TraceStart, new_create_dissector_handle(dissect_TraceStart_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_TraceFailureIndication, new_create_dissector_handle(dissect_TraceFailureIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_LocationReportingControl, new_create_dissector_handle(dissect_LocationReportingControl_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_LocationReportingFailureIndication, new_create_dissector_handle(dissect_LocationReportingFailureIndication_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_LocationReport, new_create_dissector_handle(dissect_LocationReport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_OverloadStart, new_create_dissector_handle(dissect_OverloadStart_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_OverloadStop, new_create_dissector_handle(dissect_OverloadStop_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_WriteReplaceWarning, new_create_dissector_handle(dissect_WriteReplaceWarningRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_WriteReplaceWarning, new_create_dissector_handle(dissect_WriteReplaceWarningResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_eNBDirectInformationTransfer, new_create_dissector_handle(dissect_ENBDirectInformationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_MMEDirectInformationTransfer, new_create_dissector_handle(dissect_MMEDirectInformationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_PrivateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_eNBConfigurationTransfer, new_create_dissector_handle(dissect_ENBConfigurationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_MMEConfigurationTransfer, new_create_dissector_handle(dissect_MMEConfigurationTransfer_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_CellTrafficTrace, new_create_dissector_handle(dissect_CellTrafficTrace_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_Kill, new_create_dissector_handle(dissect_KillRequest_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.sout", id_Kill, new_create_dissector_handle(dissect_KillResponse_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_downlinkUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_DownlinkUEAssociatedLPPaTransport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_uplinkUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_UplinkUEAssociatedLPPaTransport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_downlinkNonUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_DownlinkNonUEAssociatedLPPaTransport_PDU, proto_s1ap));
-  dissector_add("s1ap.proc.imsg", id_uplinkNonUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_UplinkNonUEAssociatedLPPaTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_MME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_HandoverType, new_create_dissector_handle(dissect_HandoverType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TargetID, new_create_dissector_handle(dissect_TargetID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_eNB_UE_S1AP_ID, new_create_dissector_handle(dissect_ENB_UE_S1AP_ID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABSubjecttoDataForwardingList, new_create_dissector_handle(dissect_E_RABSubjecttoDataForwardingList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABtoReleaseListHOCmd, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABDataForwardingItem, new_create_dissector_handle(dissect_E_RABDataForwardingItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABReleaseItemBearerRelComp, new_create_dissector_handle(dissect_E_RABReleaseItemBearerRelComp_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupListBearerSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupListBearerSUReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupItemBearerSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemBearerSUReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABAdmittedList, new_create_dissector_handle(dissect_E_RABAdmittedList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedToSetupListHOReqAck, new_create_dissector_handle(dissect_E_RABFailedtoSetupListHOReqAck_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABAdmittedItem, new_create_dissector_handle(dissect_E_RABAdmittedItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedtoSetupItemHOReqAck, new_create_dissector_handle(dissect_E_RABFailedToSetupItemHOReqAck_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSwitchedDLList, new_create_dissector_handle(dissect_E_RABToBeSwitchedDLList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSwitchedDLItem, new_create_dissector_handle(dissect_E_RABToBeSwitchedDLItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupListCtxtSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupListCtxtSUReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TraceActivation, new_create_dissector_handle(dissect_TraceActivation_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_NAS_PDU, new_create_dissector_handle(dissect_NAS_PDU_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupItemHOReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemHOReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABSetupListBearerSURes, new_create_dissector_handle(dissect_E_RABSetupListBearerSURes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedToSetupListBearerSURes, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeModifiedListBearerModReq, new_create_dissector_handle(dissect_E_RABToBeModifiedListBearerModReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABModifyListBearerModRes, new_create_dissector_handle(dissect_E_RABModifyListBearerModRes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedToModifyList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeReleasedList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedToReleaseList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABItem, new_create_dissector_handle(dissect_E_RABItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeModifiedItemBearerModReq, new_create_dissector_handle(dissect_E_RABToBeModifiedItemBearerModReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABModifyItemBearerModRes, new_create_dissector_handle(dissect_E_RABModifyItemBearerModRes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABSetupItemBearerSURes, new_create_dissector_handle(dissect_E_RABSetupItemBearerSURes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SecurityContext, new_create_dissector_handle(dissect_SecurityContext_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_HandoverRestrictionList, new_create_dissector_handle(dissect_HandoverRestrictionList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UEPagingID, new_create_dissector_handle(dissect_UEPagingID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_pagingDRX, new_create_dissector_handle(dissect_PagingDRX_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TAIList, new_create_dissector_handle(dissect_TAIList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TAIItem, new_create_dissector_handle(dissect_TAIItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABFailedToSetupListCtxtSURes, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABSetupItemCtxtSURes, new_create_dissector_handle(dissect_E_RABSetupItemCtxtSURes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABSetupListCtxtSURes, new_create_dissector_handle(dissect_E_RABSetupListCtxtSURes_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupItemCtxtSUReq, new_create_dissector_handle(dissect_E_RABToBeSetupItemCtxtSUReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSetupListHOReq, new_create_dissector_handle(dissect_E_RABToBeSetupListHOReq_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Global_ENB_ID, new_create_dissector_handle(dissect_Global_ENB_ID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_eNBname, new_create_dissector_handle(dissect_ENBname_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_MMEname, new_create_dissector_handle(dissect_MMEname_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_ServedPLMNs, new_create_dissector_handle(dissect_ServedPLMNs_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SupportedTAs, new_create_dissector_handle(dissect_SupportedTAs_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_uEaggregateMaximumBitrate, new_create_dissector_handle(dissect_UEAggregateMaximumBitrate_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TAI, new_create_dissector_handle(dissect_TAI_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABReleaseListBearerRelComp, new_create_dissector_handle(dissect_E_RABReleaseListBearerRelComp_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000PDU, new_create_dissector_handle(dissect_Cdma2000PDU_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000RATType, new_create_dissector_handle(dissect_Cdma2000RATType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000SectorID, new_create_dissector_handle(dissect_Cdma2000SectorID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SecurityKey, new_create_dissector_handle(dissect_SecurityKey_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UERadioCapability, new_create_dissector_handle(dissect_UERadioCapability_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_GUMMEI_ID, new_create_dissector_handle(dissect_GUMMEI_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABInformationListItem, new_create_dissector_handle(dissect_E_RABInformationListItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Direct_Forwarding_Path_Availability, new_create_dissector_handle(dissect_Direct_Forwarding_Path_Availability_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UEIdentityIndexValue, new_create_dissector_handle(dissect_UEIdentityIndexValue_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000HOStatus, new_create_dissector_handle(dissect_Cdma2000HOStatus_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000HORequiredIndication, new_create_dissector_handle(dissect_Cdma2000HORequiredIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_RelativeMMECapacity, new_create_dissector_handle(dissect_RelativeMMECapacity_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SourceMME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_eNB_StatusTransfer_TransparentContainer, new_create_dissector_handle(dissect_s1ap_ENB_StatusTransfer_TransparentContainer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UE_associatedLogicalS1_ConnectionItem, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_ResetType, new_create_dissector_handle(dissect_ResetType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UE_associatedLogicalS1_ConnectionListResAck, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionListResAck_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSwitchedULItem, new_create_dissector_handle(dissect_E_RABToBeSwitchedULItem_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABToBeSwitchedULList, new_create_dissector_handle(dissect_E_RABToBeSwitchedULList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_S_TMSI, new_create_dissector_handle(dissect_S_TMSI_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000OneXRAND, new_create_dissector_handle(dissect_Cdma2000OneXRAND_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_RequestType, new_create_dissector_handle(dissect_RequestType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UE_S1AP_IDs, new_create_dissector_handle(dissect_UE_S1AP_IDs_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_EUTRAN_CGI, new_create_dissector_handle(dissect_EUTRAN_CGI_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_OverloadResponse, new_create_dissector_handle(dissect_OverloadResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_cdma2000OneXSRVCCInfo, new_create_dissector_handle(dissect_Cdma2000OneXSRVCCInfo_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Source_ToTarget_TransparentContainer, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_ServedGUMMEIs, new_create_dissector_handle(dissect_ServedGUMMEIs_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SubscriberProfileIDforRFP, new_create_dissector_handle(dissect_SubscriberProfileIDforRFP_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_UESecurityCapabilities, new_create_dissector_handle(dissect_UESecurityCapabilities_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CSFallbackIndicator, new_create_dissector_handle(dissect_CSFallbackIndicator_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CNDomain, new_create_dissector_handle(dissect_CNDomain_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_E_RABReleasedList, new_create_dissector_handle(dissect_E_RABList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_MessageIdentifier, new_create_dissector_handle(dissect_MessageIdentifier_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SerialNumber, new_create_dissector_handle(dissect_SerialNumber_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_WarningAreaList, new_create_dissector_handle(dissect_WarningAreaList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_RepetitionPeriod, new_create_dissector_handle(dissect_RepetitionPeriod_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_NumberofBroadcastRequest, new_create_dissector_handle(dissect_NumberofBroadcastRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_WarningType, new_create_dissector_handle(dissect_WarningType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_WarningSecurityInfo, new_create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_DataCodingScheme, new_create_dissector_handle(dissect_DataCodingScheme_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_WarningMessageContents, new_create_dissector_handle(dissect_WarningMessageContents_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_BroadcastCompletedAreaList, new_create_dissector_handle(dissect_BroadcastCompletedAreaList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Inter_SystemInformationTransferTypeEDT, new_create_dissector_handle(dissect_Inter_SystemInformationTransferType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Inter_SystemInformationTransferTypeMDT, new_create_dissector_handle(dissect_Inter_SystemInformationTransferType_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Target_ToSource_TransparentContainer, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SRVCCHOIndication, new_create_dissector_handle(dissect_SRVCCHOIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CSG_Id, new_create_dissector_handle(dissect_CSG_Id_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CSG_IdList, new_create_dissector_handle(dissect_CSG_IdList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SONConfigurationTransferECT, new_create_dissector_handle(dissect_SONConfigurationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_SONConfigurationTransferMCT, new_create_dissector_handle(dissect_SONConfigurationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_TraceCollectionEntityIPAddress, new_create_dissector_handle(dissect_TransportLayerAddress_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_MSClassmark2, new_create_dissector_handle(dissect_MSClassmark2_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_MSClassmark3, new_create_dissector_handle(dissect_MSClassmark3_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_RRC_Establishment_Cause, new_create_dissector_handle(dissect_RRC_Establishment_Cause_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_NASSecurityParametersfromE_UTRAN, new_create_dissector_handle(dissect_NASSecurityParametersfromE_UTRAN_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_NASSecurityParameterstoE_UTRAN, new_create_dissector_handle(dissect_NASSecurityParameterstoE_UTRAN_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_DefaultPagingDRX, new_create_dissector_handle(dissect_PagingDRX_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Source_ToTarget_TransparentContainer_Secondary, new_create_dissector_handle(dissect_Source_ToTarget_TransparentContainer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Target_ToSource_TransparentContainer_Secondary, new_create_dissector_handle(dissect_Target_ToSource_TransparentContainer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_EUTRANRoundTripDelayEstimationInfo, new_create_dissector_handle(dissect_EUTRANRoundTripDelayEstimationInfo_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_BroadcastCancelledAreaList, new_create_dissector_handle(dissect_BroadcastCancelledAreaList_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_ConcurrentWarningMessageIndicator, new_create_dissector_handle(dissect_ConcurrentWarningMessageIndicator_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_ExtendedRepetitionPeriod, new_create_dissector_handle(dissect_ExtendedRepetitionPeriod_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CellAccessMode, new_create_dissector_handle(dissect_CellAccessMode_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_LPPa_PDU, new_create_dissector_handle(dissect_LPPa_PDU_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_Routing_ID, new_create_dissector_handle(dissect_Routing_ID_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.ies", id_PS_ServiceNotAvailable, new_create_dissector_handle(dissect_PS_ServiceNotAvailable_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.extension", id_Data_Forwarding_Not_Possible, new_create_dissector_handle(dissect_Data_Forwarding_Not_Possible_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.extension", id_Time_Synchronization_Info, new_create_dissector_handle(dissect_TimeSynchronizationInfo_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverRequired_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverCommand_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_HandoverResourceAllocation, new_create_dissector_handle(dissect_HandoverFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_HandoverNotification, new_create_dissector_handle(dissect_HandoverNotify_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequestAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_PathSwitchRequest, new_create_dissector_handle(dissect_PathSwitchRequestFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_E_RABSetup, new_create_dissector_handle(dissect_E_RABSetupRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_E_RABSetup, new_create_dissector_handle(dissect_E_RABSetupResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_E_RABModify, new_create_dissector_handle(dissect_E_RABModifyRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_E_RABModify, new_create_dissector_handle(dissect_E_RABModifyResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_E_RABRelease, new_create_dissector_handle(dissect_E_RABReleaseCommand_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_E_RABRelease, new_create_dissector_handle(dissect_E_RABReleaseResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_E_RABReleaseIndication, new_create_dissector_handle(dissect_E_RABReleaseIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_InitialContextSetup, new_create_dissector_handle(dissect_InitialContextSetupFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_UEContextReleaseRequest, new_create_dissector_handle(dissect_UEContextReleaseRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_Paging, new_create_dissector_handle(dissect_Paging_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_downlinkNASTransport, new_create_dissector_handle(dissect_DownlinkNASTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_initialUEMessage, new_create_dissector_handle(dissect_InitialUEMessage_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_uplinkNASTransport, new_create_dissector_handle(dissect_UplinkNASTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_NASNonDeliveryIndication, new_create_dissector_handle(dissect_NASNonDeliveryIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_HandoverCancel, new_create_dissector_handle(dissect_HandoverCancel_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_HandoverCancel, new_create_dissector_handle(dissect_HandoverCancelAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_Reset, new_create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_ErrorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_S1Setup, new_create_dissector_handle(dissect_S1SetupRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_S1Setup, new_create_dissector_handle(dissect_S1SetupFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_DownlinkS1cdma2000tunneling, new_create_dissector_handle(dissect_DownlinkS1cdma2000tunneling_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_ENBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdate_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateAcknowledge_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_MMEConfigurationUpdate, new_create_dissector_handle(dissect_MMEConfigurationUpdateFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_UplinkS1cdma2000tunneling, new_create_dissector_handle(dissect_UplinkS1cdma2000tunneling_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.uout", id_UEContextModification, new_create_dissector_handle(dissect_UEContextModificationFailure_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_UECapabilityInfoIndication, new_create_dissector_handle(dissect_UECapabilityInfoIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_UEContextRelease, new_create_dissector_handle(dissect_UEContextReleaseCommand_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_UEContextRelease, new_create_dissector_handle(dissect_UEContextReleaseComplete_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_eNBStatusTransfer, new_create_dissector_handle(dissect_ENBStatusTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_MMEStatusTransfer, new_create_dissector_handle(dissect_MMEStatusTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_DeactivateTrace, new_create_dissector_handle(dissect_DeactivateTrace_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_TraceStart, new_create_dissector_handle(dissect_TraceStart_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_TraceFailureIndication, new_create_dissector_handle(dissect_TraceFailureIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_LocationReportingControl, new_create_dissector_handle(dissect_LocationReportingControl_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_LocationReportingFailureIndication, new_create_dissector_handle(dissect_LocationReportingFailureIndication_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_LocationReport, new_create_dissector_handle(dissect_LocationReport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_OverloadStart, new_create_dissector_handle(dissect_OverloadStart_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_OverloadStop, new_create_dissector_handle(dissect_OverloadStop_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_WriteReplaceWarning, new_create_dissector_handle(dissect_WriteReplaceWarningRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_WriteReplaceWarning, new_create_dissector_handle(dissect_WriteReplaceWarningResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_eNBDirectInformationTransfer, new_create_dissector_handle(dissect_ENBDirectInformationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_MMEDirectInformationTransfer, new_create_dissector_handle(dissect_MMEDirectInformationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_PrivateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_eNBConfigurationTransfer, new_create_dissector_handle(dissect_ENBConfigurationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_MMEConfigurationTransfer, new_create_dissector_handle(dissect_MMEConfigurationTransfer_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_CellTrafficTrace, new_create_dissector_handle(dissect_CellTrafficTrace_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_Kill, new_create_dissector_handle(dissect_KillRequest_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.sout", id_Kill, new_create_dissector_handle(dissect_KillResponse_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_downlinkUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_DownlinkUEAssociatedLPPaTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_uplinkUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_UplinkUEAssociatedLPPaTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_downlinkNonUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_DownlinkNonUEAssociatedLPPaTransport_PDU, proto_s1ap));
+  dissector_add_uint("s1ap.proc.imsg", id_uplinkNonUEAssociatedLPPaTransport, new_create_dissector_handle(dissect_UplinkNonUEAssociatedLPPaTransport_PDU, proto_s1ap));
 
 
 /*--- End of included file: packet-s1ap-dis-tab.c ---*/
 #line 193 "packet-s1ap-template.c"
 	} else {
 		if (SctpPort != 0) {
-			dissector_delete("sctp.port", SctpPort, s1ap_handle);
+			dissector_delete_uint("sctp.port", SctpPort, s1ap_handle);
 		}
 	}
 
 	SctpPort=gbl_s1apSctpPort;
 	if (SctpPort != 0) {
-		dissector_add("sctp.port", SctpPort, s1ap_handle);
+		dissector_add_uint("sctp.port", SctpPort, s1ap_handle);
 	}
 }
 
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index c2f6962b8f..2819b6ac21 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -807,10 +807,10 @@ proto_reg_handoff_s5066(void)
 		data_handle = find_dissector("data");
 		Initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", saved_s5066_port, s5066_tcp_handle);
+		dissector_delete_uint("tcp.port", saved_s5066_port, s5066_tcp_handle);
 	}
 
-	dissector_add("tcp.port", global_s5066_port, s5066_tcp_handle);
+	dissector_add_uint("tcp.port", global_s5066_port, s5066_tcp_handle);
 	saved_s5066_port = global_s5066_port;
 
 	if (!s5066_edition_one) {
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 783ccaeaf5..1722228556 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1686,27 +1686,27 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static guint
@@ -2179,53 +2179,53 @@ proto_reg_handoff_sabp(void)
 
   sabp_handle = find_dissector("sabp");
   sabp_tcp_handle = find_dissector("sabp.tcp");
-  dissector_add("udp.port", 3452, sabp_handle);
-  dissector_add("tcp.port", 3452, sabp_tcp_handle);
-  dissector_add("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
+  dissector_add_uint("udp.port", 3452, sabp_handle);
+  dissector_add_uint("tcp.port", 3452, sabp_tcp_handle);
+  dissector_add_uint("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
 
 
 /*--- Included file: packet-sabp-dis-tab.c ---*/
 #line 1 "packet-sabp-dis-tab.c"
-  dissector_add("sabp.ies", id_Message_Identifier, new_create_dissector_handle(dissect_Message_Identifier_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_New_Serial_Number, new_create_dissector_handle(dissect_New_Serial_Number_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Old_Serial_Number, new_create_dissector_handle(dissect_Old_Serial_Number_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Service_Areas_List, new_create_dissector_handle(dissect_Service_Areas_List_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Category, new_create_dissector_handle(dissect_Category_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Repetition_Period, new_create_dissector_handle(dissect_Repetition_Period_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Number_of_Broadcasts_Requested, new_create_dissector_handle(dissect_Number_of_Broadcasts_Requested_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Data_Coding_Scheme, new_create_dissector_handle(dissect_Data_Coding_Scheme_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Broadcast_Message_Content, new_create_dissector_handle(dissect_Broadcast_Message_Content_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Number_of_Broadcasts_Completed_List, new_create_dissector_handle(dissect_Number_of_Broadcasts_Completed_List_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Criticality_Diagnostics, new_create_dissector_handle(dissect_Criticality_Diagnostics_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Failure_List, new_create_dissector_handle(dissect_Failure_List_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Radio_Resource_Loading_List, new_create_dissector_handle(dissect_Radio_Resource_Loading_List_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Recovery_Indication, new_create_dissector_handle(dissect_Recovery_Indication_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Serial_Number, new_create_dissector_handle(dissect_Serial_Number_PDU, proto_sabp));
-  dissector_add("sabp.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_Paging_ETWS_Indicator, new_create_dissector_handle(dissect_Paging_ETWS_Indicator_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_Warning_Type, new_create_dissector_handle(dissect_Warning_Type_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_WarningSecurityInfo, new_create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_sabp));
-  dissector_add("sabp.extension", id_Broadcast_Message_Content_Validity_Indicator, new_create_dissector_handle(dissect_Broadcast_Message_Content_Validity_Indicator_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_PDU, proto_sabp));
-  dissector_add("sabp.proc.sout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Complete_PDU, proto_sabp));
-  dissector_add("sabp.proc.uout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Kill, new_create_dissector_handle(dissect_Kill_PDU, proto_sabp));
-  dissector_add("sabp.proc.sout", id_Kill, new_create_dissector_handle(dissect_Kill_Complete_PDU, proto_sabp));
-  dissector_add("sabp.proc.uout", id_Kill, new_create_dissector_handle(dissect_Kill_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_PDU, proto_sabp));
-  dissector_add("sabp.proc.sout", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_Complete_PDU, proto_sabp));
-  dissector_add("sabp.proc.uout", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_PDU, proto_sabp));
-  dissector_add("sabp.proc.sout", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_Complete_PDU, proto_sabp));
-  dissector_add("sabp.proc.uout", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_sabp));
-  dissector_add("sabp.proc.sout", id_Reset, new_create_dissector_handle(dissect_Reset_Complete_PDU, proto_sabp));
-  dissector_add("sabp.proc.uout", id_Reset, new_create_dissector_handle(dissect_Reset_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Restart_Indication, new_create_dissector_handle(dissect_Restart_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Failure_Indication, new_create_dissector_handle(dissect_Failure_PDU, proto_sabp));
-  dissector_add("sabp.proc.imsg", id_Error_Indication, new_create_dissector_handle(dissect_Error_Indication_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Message_Identifier, new_create_dissector_handle(dissect_Message_Identifier_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_New_Serial_Number, new_create_dissector_handle(dissect_New_Serial_Number_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Old_Serial_Number, new_create_dissector_handle(dissect_Old_Serial_Number_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Service_Areas_List, new_create_dissector_handle(dissect_Service_Areas_List_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Category, new_create_dissector_handle(dissect_Category_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Repetition_Period, new_create_dissector_handle(dissect_Repetition_Period_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Number_of_Broadcasts_Requested, new_create_dissector_handle(dissect_Number_of_Broadcasts_Requested_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Data_Coding_Scheme, new_create_dissector_handle(dissect_Data_Coding_Scheme_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Broadcast_Message_Content, new_create_dissector_handle(dissect_Broadcast_Message_Content_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Number_of_Broadcasts_Completed_List, new_create_dissector_handle(dissect_Number_of_Broadcasts_Completed_List_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Criticality_Diagnostics, new_create_dissector_handle(dissect_Criticality_Diagnostics_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Failure_List, new_create_dissector_handle(dissect_Failure_List_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Radio_Resource_Loading_List, new_create_dissector_handle(dissect_Radio_Resource_Loading_List_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Recovery_Indication, new_create_dissector_handle(dissect_Recovery_Indication_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Serial_Number, new_create_dissector_handle(dissect_Serial_Number_PDU, proto_sabp));
+  dissector_add_uint("sabp.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_MessageStructure, new_create_dissector_handle(dissect_MessageStructure_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_TypeOfError, new_create_dissector_handle(dissect_TypeOfError_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_Paging_ETWS_Indicator, new_create_dissector_handle(dissect_Paging_ETWS_Indicator_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_Warning_Type, new_create_dissector_handle(dissect_Warning_Type_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_WarningSecurityInfo, new_create_dissector_handle(dissect_WarningSecurityInfo_PDU, proto_sabp));
+  dissector_add_uint("sabp.extension", id_Broadcast_Message_Content_Validity_Indicator, new_create_dissector_handle(dissect_Broadcast_Message_Content_Validity_Indicator_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.sout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Complete_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.uout", id_Write_Replace, new_create_dissector_handle(dissect_Write_Replace_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Kill, new_create_dissector_handle(dissect_Kill_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.sout", id_Kill, new_create_dissector_handle(dissect_Kill_Complete_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.uout", id_Kill, new_create_dissector_handle(dissect_Kill_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.sout", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_Complete_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.uout", id_Load_Status_Enquiry, new_create_dissector_handle(dissect_Load_Query_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.sout", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_Complete_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.uout", id_Message_Status_Query, new_create_dissector_handle(dissect_Message_Status_Query_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Reset, new_create_dissector_handle(dissect_Reset_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.sout", id_Reset, new_create_dissector_handle(dissect_Reset_Complete_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.uout", id_Reset, new_create_dissector_handle(dissect_Reset_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Restart_Indication, new_create_dissector_handle(dissect_Restart_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Failure_Indication, new_create_dissector_handle(dissect_Failure_PDU, proto_sabp));
+  dissector_add_uint("sabp.proc.imsg", id_Error_Indication, new_create_dissector_handle(dissect_Error_Indication_PDU, proto_sabp));
 
 
 /*--- End of included file: packet-sabp-dis-tab.c ---*/
diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c
index f6c5d1a7bb..7cef0821ec 100644
--- a/epan/dissectors/packet-sametime.c
+++ b/epan/dissectors/packet-sametime.c
@@ -928,10 +928,10 @@ proto_reg_handoff_sametime(void)
 				    sametime_stats_tree_init, NULL );
 		initialized = TRUE;
 	} else {
-	        dissector_delete("tcp.port", saved_sametime_tcp_port, sametime_handle);
+	        dissector_delete_uint("tcp.port", saved_sametime_tcp_port, sametime_handle);
 	}
 
-	dissector_add("tcp.port", global_sametime_port, sametime_handle);
+	dissector_add_uint("tcp.port", global_sametime_port, sametime_handle);
 	saved_sametime_tcp_port = global_sametime_port;
 }
 
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 9030d59a4e..51f69204ce 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -359,7 +359,7 @@ proto_reg_handoff_sap(void)
   dissector_handle_t sap_handle;
 
   sap_handle = create_dissector_handle(dissect_sap, proto_sap);
-  dissector_add("udp.port", UDP_PORT_SAP, sap_handle);
+  dissector_add_uint("udp.port", UDP_PORT_SAP, sap_handle);
 
   /*
    * Get a handle for the SDP dissector.
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index accbaafb01..cbfe4f3f8e 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -1604,7 +1604,7 @@ proto_reg_handoff_sasp(void)
 {
 	dissector_handle_t sasp_handle;
 	sasp_handle = create_dissector_handle(dissect_sasp, proto_sasp);
-	dissector_add("tcp.port", SASP_GLOBAL_PORT, sasp_handle);
+	dissector_add_uint("tcp.port", SASP_GLOBAL_PORT, sasp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index 94430d6dc6..34d6651569 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -2337,7 +2337,7 @@ proto_reg_handoff_sbus(void)
        dissector_handle_t sbus_handle;
 
        sbus_handle = new_create_dissector_handle(dissect_sbus, proto_sbus);
-       dissector_add("udp.port", 5050, sbus_handle);
+       dissector_add_uint("udp.port", 5050, sbus_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 7c84ba2dcb..ee90694299 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -1408,7 +1408,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info *
       /* Get the dissector handle of the dissector registered for this ssn
        * And print it's name.
        */
-      ssn_dissector = dissector_get_port_handle(sccp_ssn_dissector_table, ssn);
+      ssn_dissector = dissector_get_uint_handle(sccp_ssn_dissector_table, ssn);
 
       if (ssn_dissector) {
 	ssn_dissector_short_name = dissector_handle_get_short_name(ssn_dissector);
@@ -1784,11 +1784,11 @@ dissect_sccp_data_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
    }
 
-    if (ssn != INVALID_SSN && dissector_try_port(sccp_ssn_dissector_table, ssn, tvb, pinfo, tree)) {
+    if (ssn != INVALID_SSN && dissector_try_uint(sccp_ssn_dissector_table, ssn, tvb, pinfo, tree)) {
 		return;
     }
 
-    if (other_ssn != INVALID_SSN && dissector_try_port(sccp_ssn_dissector_table, other_ssn, tvb, pinfo, tree)) {
+    if (other_ssn != INVALID_SSN && dissector_try_uint(sccp_ssn_dissector_table, other_ssn, tvb, pinfo, tree)) {
 		return;
     }
 
@@ -3441,8 +3441,8 @@ proto_reg_handoff_sccp(void)
   if (!initialised) {
     sccp_handle = find_dissector("sccp");
 
-    dissector_add("wtap_encap", WTAP_ENCAP_SCCP, sccp_handle);
-    dissector_add("mtp3.service_indicator", SCCP_SI, sccp_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_SCCP, sccp_handle);
+    dissector_add_uint("mtp3.service_indicator", SCCP_SI, sccp_handle);
     dissector_add_string("tali.opcode", "sccp", sccp_handle);
 
     data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index d134e76216..245dd2f305 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -369,6 +369,6 @@ proto_reg_handoff_sccpmg(void)
 	sccpmg_handle = create_dissector_handle(dissect_sccpmg, proto_sccpmg);
 
 	/* Register for SCCP SSN=1 messages */
-	dissector_add("sccp.ssn", SCCPMG_SSN, sccpmg_handle);
+	dissector_add_uint("sccp.ssn", SCCPMG_SSN, sccpmg_handle);
 }
 
diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c
index 783f2d85fe..887aeade9c 100644
--- a/epan/dissectors/packet-scop.c
+++ b/epan/dissectors/packet-scop.c
@@ -414,15 +414,15 @@ void proto_reg_handoff_scop(void)
         data_handle         = find_dissector("data");
         inited = TRUE;
     } else {
-        dissector_delete("udp.port", lastPort, scop_udp_handle);
-        dissector_delete("tcp.port", lastPort, scop_tcp_handle);
-        dissector_delete("udp.port", lastPort_secured, scop_udp_handle);
-        dissector_delete("tcp.port", lastPort_secured, scop_tcp_handle);
+        dissector_delete_uint("udp.port", lastPort, scop_udp_handle);
+        dissector_delete_uint("tcp.port", lastPort, scop_tcp_handle);
+        dissector_delete_uint("udp.port", lastPort_secured, scop_udp_handle);
+        dissector_delete_uint("tcp.port", lastPort_secured, scop_tcp_handle);
     }
-    dissector_add("udp.port", gPREF_scop_port, scop_udp_handle);
-    dissector_add("tcp.port", gPREF_scop_port, scop_tcp_handle);
-    dissector_add("udp.port", gPREF_scop_port_secured, scop_udp_handle);
-    dissector_add("tcp.port", gPREF_scop_port_secured, scop_tcp_handle);
+    dissector_add_uint("udp.port", gPREF_scop_port, scop_udp_handle);
+    dissector_add_uint("tcp.port", gPREF_scop_port, scop_tcp_handle);
+    dissector_add_uint("udp.port", gPREF_scop_port_secured, scop_udp_handle);
+    dissector_add_uint("tcp.port", gPREF_scop_port_secured, scop_tcp_handle);
 
     lastPort         = gPREF_scop_port;
     lastPort_secured = gPREF_scop_port_secured;
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index 37b79a2259..c14ff48215 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -237,5 +237,5 @@ proto_reg_handoff_ssprotocol(void)
   dissector_handle_t ssprotocol_handle;
 
   ssprotocol_handle = new_create_dissector_handle(dissect_ssprotocol, proto_ssprotocol);
-  dissector_add("sctp.ppi", SSPROTOCOL_PAYLOAD_PROTOCOL_ID, ssprotocol_handle);
+  dissector_add_uint("sctp.ppi", SSPROTOCOL_PAYLOAD_PROTOCOL_ID, ssprotocol_handle);
 }
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 76fdc6b329..3765689228 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -1923,7 +1923,7 @@ dissect_payload(tvbuff_t *payload_tvb, packet_info *pinfo, proto_tree *tree, gui
 
        XXX - we ignore port numbers of 0, as some dissectors use a port
        number of 0 to disable the port. */
-    if (dissector_try_port(sctp_ppi_dissector_table, ppi, payload_tvb, pinfo, tree))
+    if (dissector_try_uint(sctp_ppi_dissector_table, ppi, payload_tvb, pinfo, tree))
       return TRUE;
     if (pinfo->srcport > pinfo->destport) {
       low_port = pinfo->destport;
@@ -1933,10 +1933,10 @@ dissect_payload(tvbuff_t *payload_tvb, packet_info *pinfo, proto_tree *tree, gui
       high_port = pinfo->destport;
     }
     if (low_port != 0 &&
-        dissector_try_port(sctp_port_dissector_table, low_port, payload_tvb, pinfo, tree))
+        dissector_try_uint(sctp_port_dissector_table, low_port, payload_tvb, pinfo, tree))
       return TRUE;
     if (high_port != 0 &&
-        dissector_try_port(sctp_port_dissector_table, high_port, payload_tvb, pinfo, tree))
+        dissector_try_uint(sctp_port_dissector_table, high_port, payload_tvb, pinfo, tree))
       return TRUE;
 
     if (!try_heuristic_first) {
@@ -4109,6 +4109,6 @@ proto_reg_handoff_sctp(void)
 
   data_handle = find_dissector("data");
   sctp_handle = find_dissector("sctp");
-  dissector_add("ip.proto", IP_PROTO_SCTP, sctp_handle);
-  dissector_add("udp.port", UDP_TUNNELING_PORT, sctp_handle);
+  dissector_add_uint("ip.proto", IP_PROTO_SCTP, sctp_handle);
+  dissector_add_uint("udp.port", UDP_TUNNELING_PORT, sctp_handle);
 }
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index fe14fd2c99..aab902093d 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -210,5 +210,5 @@ proto_reg_handoff_sdlc(void)
 	data_handle = find_dissector("data");
 
 	sdlc_handle = create_dissector_handle(dissect_sdlc, proto_sdlc);
-	dissector_add("wtap_encap", WTAP_ENCAP_SDLC, sdlc_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_SDLC, sdlc_handle);
 }
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 2199027780..ce7cb363b3 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -2085,5 +2085,5 @@ proto_reg_handoff_sdp(void)
 
   sdp_handle = find_dissector("sdp");
   dissector_add_string("media_type", "application/sdp", sdp_handle);
-  dissector_add("bctp.tpi", 0x20, sdp_handle);
+  dissector_add_uint("bctp.tpi", 0x20, sdp_handle);
 }
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index f78809ab05..5c28e44be0 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -354,5 +354,5 @@ proto_reg_handoff_sebek(void)
 	dissector_handle_t sebek_handle;
 
 	sebek_handle = create_dissector_handle(dissect_sebek, proto_sebek);
-	dissector_add("udp.port", UDP_PORT_SEBEK, sebek_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SEBEK, sebek_handle);
 }
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 9693056a00..87588045e6 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -3364,14 +3364,14 @@ proto_register_sflow(void) {
 static void
 sflow_245_delete_callback(guint32 port) {
     if (port) {
-        dissector_delete("udp.port", port, sflow_handle);
+        dissector_delete_uint("udp.port", port, sflow_handle);
     }
 }
 
 static void
 sflow_245_add_callback(guint32 port) {
     if (port) {
-        dissector_add("udp.port", port, sflow_handle);
+        dissector_add_uint("udp.port", port, sflow_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 566b78f3a5..e35f944e39 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -2274,10 +2274,10 @@ proto_reg_handoff_sigcomp(void)
 		sip_handle = find_dissector("sip");
 		Initialized=TRUE;
 	}else{
-		dissector_delete("udp.port", udp_port1, sigcomp_handle);
-		dissector_delete("udp.port", udp_port2, sigcomp_handle);
-		dissector_delete("tcp.port", tcp_port1, sigcomp_tcp_handle);
-		dissector_delete("tcp.port", tcp_port2, sigcomp_tcp_handle);
+		dissector_delete_uint("udp.port", udp_port1, sigcomp_handle);
+		dissector_delete_uint("udp.port", udp_port2, sigcomp_handle);
+		dissector_delete_uint("tcp.port", tcp_port1, sigcomp_tcp_handle);
+		dissector_delete_uint("tcp.port", tcp_port2, sigcomp_tcp_handle);
 	}
 
 	udp_port1 = SigCompUDPPort1;
@@ -2286,10 +2286,10 @@ proto_reg_handoff_sigcomp(void)
 	tcp_port2 = SigCompTCPPort2;
 
 
-	dissector_add("udp.port", SigCompUDPPort1, sigcomp_handle);
-	dissector_add("udp.port", SigCompUDPPort2, sigcomp_handle);
-	dissector_add("tcp.port", SigCompTCPPort1, sigcomp_tcp_handle);
-	dissector_add("tcp.port", SigCompTCPPort2, sigcomp_tcp_handle);
+	dissector_add_uint("udp.port", SigCompUDPPort1, sigcomp_handle);
+	dissector_add_uint("udp.port", SigCompUDPPort2, sigcomp_handle);
+	dissector_add_uint("tcp.port", SigCompTCPPort1, sigcomp_tcp_handle);
+	dissector_add_uint("tcp.port", SigCompTCPPort2, sigcomp_tcp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c
index 6e3485f962..e3f99b8c15 100644
--- a/epan/dissectors/packet-simulcrypt.c
+++ b/epan/dissectors/packet-simulcrypt.c
@@ -1848,14 +1848,14 @@ proto_reg_handoff_simulcrypt(void)
 		initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", tcp_port, simulcrypt_handle);
-		dissector_delete("udp.port", udp_port, simulcrypt_handle);
+		dissector_delete_uint("tcp.port", tcp_port, simulcrypt_handle);
+		dissector_delete_uint("udp.port", udp_port, simulcrypt_handle);
 	}
 	if (global_simulcrypt_tcp_port != 0) {
-		dissector_add("tcp.port", global_simulcrypt_tcp_port, simulcrypt_handle);
+		dissector_add_uint("tcp.port", global_simulcrypt_tcp_port, simulcrypt_handle);
 	}
 	if (global_simulcrypt_udp_port != 0) {
-		dissector_add("udp.port", global_simulcrypt_udp_port, simulcrypt_handle);
+		dissector_add_uint("udp.port", global_simulcrypt_udp_port, simulcrypt_handle);
 	}
 	tcp_port = global_simulcrypt_tcp_port;
 	udp_port = global_simulcrypt_udp_port;
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 5528bcf0e0..11f21b9153 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -3546,13 +3546,13 @@ guint sip_find_invite(packet_info *pinfo,
 static void
 tcp_range_add_callback(guint32 port)
 {
-	dissector_add("tcp.port", port, sip_tcp_handle);
+	dissector_add_uint("tcp.port", port, sip_tcp_handle);
 }
 
 static void
 tcp_range_delete_callback(guint32 port)
 {
-	dissector_delete("tcp.port", port, sip_tcp_handle);
+	dissector_delete_uint("tcp.port", port, sip_tcp_handle);
 }
 
 /* Register the protocol with Wireshark */
@@ -4644,7 +4644,7 @@ proto_reg_handoff_sip(void)
 		/* SIP content type and internet media type used by other dissectors are the same */
 		media_type_dissector_table = find_dissector_table("media_type");
 
-		dissector_add("udp.port", UDP_PORT_SIP, sip_handle);
+		dissector_add_uint("udp.port", UDP_PORT_SIP, sip_handle);
 		dissector_add_string("media_type", "message/sip", sip_handle);
 
 		heur_dissector_add("udp", dissect_sip_heur, proto_sip);
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c
index dfaa5a5a03..6a7b868c41 100644
--- a/epan/dissectors/packet-sita.c
+++ b/epan/dissectors/packet-sita.c
@@ -194,7 +194,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 	}
 
-	if (!dissector_try_port(sita_dissector_table, pinfo->pseudo_header->sita.proto, tvb, pinfo, tree)) {		/* try to find and run an applicable dissector */
+	if (!dissector_try_uint(sita_dissector_table, pinfo->pseudo_header->sita.proto, tvb, pinfo, tree)) {		/* try to find and run an applicable dissector */
 		if (check_col(pinfo->cinfo, COL_PROTOCOL))																/* if one can't be found... tell them we don't */
 			col_set_str(pinfo->cinfo, COL_PROTOCOL, "UKNOWN");													/* know how to decode this protocol */
 		if (check_col(pinfo->cinfo, COL_INFO))
@@ -295,10 +295,10 @@ proto_reg_handoff_sita(void)
 	sita_handle 		= find_dissector("sita");
 	data_handle		= find_dissector("data");
 
-	dissector_add("sita.proto", SITA_PROTO_BOP_LAPB,	lapb_handle);
-	dissector_add("sita.proto", SITA_PROTO_BOP_FRL,		frame_relay_handle);
-	dissector_add("sita.proto", SITA_PROTO_UTS,		uts_handle);
-	dissector_add("sita.proto", SITA_PROTO_ALC,		ipars_handle);
-	dissector_add("wtap_encap", WTAP_ENCAP_SITA,		sita_handle);
+	dissector_add_uint("sita.proto", SITA_PROTO_BOP_LAPB,	lapb_handle);
+	dissector_add_uint("sita.proto", SITA_PROTO_BOP_FRL,		frame_relay_handle);
+	dissector_add_uint("sita.proto", SITA_PROTO_UTS,		uts_handle);
+	dissector_add_uint("sita.proto", SITA_PROTO_ALC,		ipars_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_SITA,		sita_handle);
 }
 
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index c6261b8732..b80aa1d8db 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -4451,7 +4451,7 @@ proto_reg_handoff_skinny(void)
 
   rtp_handle = find_dissector("rtp");
   skinny_handle = new_create_dissector_handle(dissect_skinny, proto_skinny);
-  dissector_add("tcp.port", TCP_PORT_SKINNY, skinny_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_SKINNY, skinny_handle);
 }
 
 /*
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index 1962b6a654..868b0e0d6a 100644
--- a/epan/dissectors/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
@@ -751,6 +751,6 @@ proto_reg_handoff_slimp3(void)
   dissector_handle_t slimp3_handle;
 
   slimp3_handle = new_create_dissector_handle(dissect_slimp3, proto_slimp3);
-  dissector_add("udp.port", UDP_PORT_SLIMP3_V1, slimp3_handle);
-  dissector_add("udp.port", UDP_PORT_SLIMP3_V2, slimp3_handle);
+  dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V1, slimp3_handle);
+  dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V2, slimp3_handle);
 }
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 4664cfeb04..5b35e4e5ec 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -241,7 +241,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		proto_tree_add_uint(fh_tree, hf_sll_ltype, tvb, 14, 2,
 		    protocol);
 
-		if(!dissector_try_port(sll_linux_dissector_table, protocol,
+		if(!dissector_try_uint(sll_linux_dissector_table, protocol,
 			next_tvb, pinfo, tree)) {
 			call_dissector(data_handle, next_tvb, pinfo, tree);
 		}
@@ -250,7 +250,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		case ARPHRD_IPGRE:
 			proto_tree_add_uint(fh_tree, hf_sll_gretype, tvb, 14, 2,
 			    protocol);
-			dissector_try_port(gre_dissector_table,
+			dissector_try_uint(gre_dissector_table,
 					   protocol, next_tvb, pinfo, tree);
 			break;
 		default:
@@ -341,5 +341,5 @@ proto_reg_handoff_sll(void)
 	data_handle = find_dissector("data");
 
 	sll_handle = create_dissector_handle(dissect_sll, proto_sll);
-	dissector_add("wtap_encap", WTAP_ENCAP_SLL, sll_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_SLL, sll_handle);
 }
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index 3d29a85558..b961a5a314 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -3566,6 +3566,6 @@ proto_reg_handoff_slow_protocols(void)
     dissector_handle_t slow_protocols_handle;
 
     slow_protocols_handle = create_dissector_handle(dissect_slow_protocols, proto_slow);
-    dissector_add("ethertype", ETHERTYPE_SLOW_PROTOCOLS, slow_protocols_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_SLOW_PROTOCOLS, slow_protocols_handle);
     dh_data = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index f1da4c07e8..b4f700f381 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -2619,8 +2619,8 @@ proto_reg_handoff_slsk(void)
 	dissector_handle_t slsk_handle;
 
 	slsk_handle = create_dissector_handle(dissect_slsk, proto_slsk);
-	dissector_add("tcp.port", TCP_PORT_SLSK_1, slsk_handle);
-	dissector_add("tcp.port", TCP_PORT_SLSK_2, slsk_handle);
-	dissector_add("tcp.port", TCP_PORT_SLSK_3, slsk_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SLSK_1, slsk_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SLSK_2, slsk_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SLSK_3, slsk_handle);
 }
 
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index f106e5565d..399654d752 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -17367,9 +17367,9 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	offset += 2;
 
 	if (pinfo->ptype == PT_IPX &&
-	    (pinfo->match_port == IPX_SOCKET_NWLINK_SMB_SERVER ||
-	     pinfo->match_port == IPX_SOCKET_NWLINK_SMB_REDIR ||
-	     pinfo->match_port == IPX_SOCKET_NWLINK_SMB_MESSENGER)) {
+	    (pinfo->match_uint == IPX_SOCKET_NWLINK_SMB_SERVER ||
+	     pinfo->match_uint == IPX_SOCKET_NWLINK_SMB_REDIR ||
+	     pinfo->match_uint == IPX_SOCKET_NWLINK_SMB_MESSENGER)) {
 		/*
 		 * This is SMB-over-IPX.
 		 * XXX - do we have to worry about "sequenced commands",
@@ -19990,8 +19990,8 @@ proto_reg_handoff_smb(void)
 	heur_dissector_add("vines_spp", dissect_smb_heur, proto_smb);
 
 	smb_handle = find_dissector("smb");
-	dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_SERVER, smb_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_REDIR, smb_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_NWLINK_SMB_MESSENGER, smb_handle);
-	dissector_add("spp.socket", IDP_SOCKET_SMB, smb_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_SERVER, smb_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_REDIR, smb_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_MESSENGER, smb_handle);
+	dissector_add_uint("spp.socket", IDP_SOCKET_SMB, smb_handle);
 }
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index e926825bf8..d90420735d 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -736,6 +736,6 @@ void proto_reg_handoff_smrse(void) {
   dissector_handle_t smrse_handle;
 
   smrse_handle = new_create_dissector_handle(dissect_smrse, proto_smrse);
-  dissector_add("tcp.port",TCP_PORT_SMRSE, smrse_handle);
+  dissector_add_uint("tcp.port",TCP_PORT_SMRSE, smrse_handle);
 }
 
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 07a6595c85..000e6f278d 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -333,7 +333,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   }
 
   /* Is this a request or a response? */
-  request = pinfo->destport == pinfo->match_port;
+  request = pinfo->destport == pinfo->match_uint;
 
   /*
    * Is there any data attached to this frame?
@@ -961,9 +961,9 @@ proto_reg_handoff_smtp(void)
   dissector_handle_t smtp_handle;
 
   smtp_handle = find_dissector("smtp");
-  dissector_add("tcp.port", TCP_PORT_SMTP, smtp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_SMTP, smtp_handle);
   ssl_dissector_add(TCP_PORT_SSL_SMTP, "smtp", TRUE);
-  dissector_add("tcp.port", TCP_PORT_SUBMISSION, smtp_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_SUBMISSION, smtp_handle);
 
   /* find the IMF dissector */
   imf_handle = find_dissector("imf");
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 81cb72f07f..8bac7e59d1 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -3565,16 +3565,16 @@ proto_reg_handoff_sna(void)
 
 	sna_handle = find_dissector("sna");
 	sna_xid_handle = find_dissector("sna_xid");
-	dissector_add("llc.dsap", SAP_SNA_PATHCTRL, sna_handle);
-	dissector_add("llc.dsap", SAP_SNA1, sna_handle);
-	dissector_add("llc.dsap", SAP_SNA2, sna_handle);
-	dissector_add("llc.dsap", SAP_SNA3, sna_handle);
-	dissector_add("llc.xid_dsap", SAP_SNA_PATHCTRL, sna_xid_handle);
-	dissector_add("llc.xid_dsap", SAP_SNA1, sna_xid_handle);
-	dissector_add("llc.xid_dsap", SAP_SNA2, sna_xid_handle);
-	dissector_add("llc.xid_dsap", SAP_SNA3, sna_xid_handle);
+	dissector_add_uint("llc.dsap", SAP_SNA_PATHCTRL, sna_handle);
+	dissector_add_uint("llc.dsap", SAP_SNA1, sna_handle);
+	dissector_add_uint("llc.dsap", SAP_SNA2, sna_handle);
+	dissector_add_uint("llc.dsap", SAP_SNA3, sna_handle);
+	dissector_add_uint("llc.xid_dsap", SAP_SNA_PATHCTRL, sna_xid_handle);
+	dissector_add_uint("llc.xid_dsap", SAP_SNA1, sna_xid_handle);
+	dissector_add_uint("llc.xid_dsap", SAP_SNA2, sna_xid_handle);
+	dissector_add_uint("llc.xid_dsap", SAP_SNA3, sna_xid_handle);
 	/* RFC 2043 */
-	dissector_add("ppp.protocol", PPP_SNA, sna_handle);
+	dissector_add_uint("ppp.protocol", PPP_SNA, sna_handle);
 	data_handle = find_dissector("data");
 
 }
diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index c0ba428715..a2ecb126c3 100644
--- a/epan/dissectors/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
@@ -107,5 +107,5 @@ proto_reg_handoff_snaeth(void)
 	llc_handle = find_dissector("llc");
 
 	snaeth_handle = create_dissector_handle(dissect_snaeth, proto_snaeth);
-	dissector_add("ethertype", ETHERTYPE_SNA, snaeth_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_SNA, snaeth_handle);
 }
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 935de3efbe..cb2e9a9535 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -573,10 +573,10 @@ proto_reg_handoff_sndcp(void)
 
   /* Register SNDCP dissector with LLC layer for SAPI 3,5,9 and 11 
    */
-  dissector_add("llcgprs.sapi",  3, sndcp_handle);
-  dissector_add("llcgprs.sapi",  5, sndcp_handle);
-  dissector_add("llcgprs.sapi",  9, sndcp_handle);
-  dissector_add("llcgprs.sapi", 11, sndcp_handle);
+  dissector_add_uint("llcgprs.sapi",  3, sndcp_handle);
+  dissector_add_uint("llcgprs.sapi",  5, sndcp_handle);
+  dissector_add_uint("llcgprs.sapi",  9, sndcp_handle);
+  dissector_add_uint("llcgprs.sapi", 11, sndcp_handle);
 
   /* Find IP and data handle for upper layer dissectors 
    */
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index cd2549c986..fd33e8715a 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3767,17 +3767,17 @@ void proto_reg_handoff_snmp(void) {
 
 	snmp_handle = find_dissector("snmp");
 
-	dissector_add("udp.port", UDP_PORT_SNMP, snmp_handle);
-	dissector_add("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
-	dissector_add("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
-	dissector_add("ethertype", ETHERTYPE_SNMP, snmp_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
-	dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
-	dissector_add("hpext.dxsap", HPEXT_SNMP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_SNMP, snmp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
+	dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
+	dissector_add_uint("hpext.dxsap", HPEXT_SNMP, snmp_handle);
 
 	snmp_tcp_handle = create_dissector_handle(dissect_snmp_tcp, proto_snmp);
-	dissector_add("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
-	dissector_add("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
 
 	data_handle = find_dissector("data");
 
@@ -3820,5 +3820,5 @@ proto_reg_handoff_smux(void)
 	dissector_handle_t smux_handle;
 
 	smux_handle = create_dissector_handle(dissect_smux, proto_smux);
-	dissector_add("tcp.port", TCP_PORT_SMUX, smux_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
 }
diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c
index 31851da279..9145d84b5f 100644
--- a/epan/dissectors/packet-socketcan.c
+++ b/epan/dissectors/packet-socketcan.c
@@ -195,8 +195,8 @@ proto_reg_handoff_socketcan(void)
 	data_handle = find_dissector("data");
 
 	can_handle = create_dissector_handle(dissect_socketcan, proto_can);
-	dissector_add("wtap_encap", WTAP_ENCAP_SOCKETCAN, can_handle);
-	dissector_add("sll.ltype", LINUX_SLL_P_CAN, can_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_SOCKETCAN, can_handle);
+	dissector_add_uint("sll.ltype", LINUX_SLL_P_CAN, can_handle);
 }
 
 
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 033a36307f..79beed2974 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -1250,5 +1250,5 @@ proto_reg_handoff_socks(void) {
 	socks_udp_handle = create_dissector_handle(socks_udp_dissector, proto_socks);
 	socks_handle = create_dissector_handle(dissect_socks, proto_socks);
 
- 	dissector_add("tcp.port", TCP_PORT_SOCKS, socks_handle);
+ 	dissector_add_uint("tcp.port", TCP_PORT_SOCKS, socks_handle);
 }
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c
index 7353dc9710..e9c180ad55 100644
--- a/epan/dissectors/packet-spp.c
+++ b/epan/dissectors/packet-spp.c
@@ -195,10 +195,10 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 
 		next_tvb = tvb_new_subset_remaining(tvb, SPP_HEADER_LEN);
-		if (dissector_try_port(spp_socket_dissector_table, low_socket,
+		if (dissector_try_uint(spp_socket_dissector_table, low_socket,
 		    next_tvb, pinfo, tree))
 			return;
-		if (dissector_try_port(spp_socket_dissector_table, high_socket,
+		if (dissector_try_uint(spp_socket_dissector_table, high_socket,
 		    next_tvb, pinfo, tree))
 			return;
 		call_dissector(data_handle, next_tvb, pinfo, tree);
@@ -291,7 +291,7 @@ proto_reg_handoff_spp(void)
 	dissector_handle_t spp_handle;
 
 	spp_handle = create_dissector_handle(dissect_spp, proto_spp);
-	dissector_add("idp.packet_type", IDP_PACKET_TYPE_SPP, spp_handle);
+	dissector_add_uint("idp.packet_type", IDP_PACKET_TYPE_SPP, spp_handle);
 
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index aa747c2900..4b16d804f8 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -771,6 +771,6 @@ proto_reg_handoff_sqloracle(void)
     dissector_handle_t sqloracle_handle;
 
     sqloracle_handle = find_dissector("sqloracle");
-    dissector_add("tns.port", TCP_PORT_TNS, sqloracle_handle);
+    dissector_add_uint("tns.port", TCP_PORT_TNS, sqloracle_handle);
 }
 
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 1869244f9c..b18eb0f60e 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -1905,8 +1905,8 @@ proto_reg_handoff_srvloc(void)
 {
     dissector_handle_t srvloc_handle, srvloc_tcp_handle;
     srvloc_handle = create_dissector_handle(dissect_srvloc, proto_srvloc);
-    dissector_add("udp.port", UDP_PORT_SRVLOC, srvloc_handle);
+    dissector_add_uint("udp.port", UDP_PORT_SRVLOC, srvloc_handle);
     srvloc_tcp_handle = create_dissector_handle(dissect_srvloc_tcp,
 						proto_srvloc);
-    dissector_add("tcp.port", TCP_PORT_SRVLOC, srvloc_tcp_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_SRVLOC, srvloc_tcp_handle);
 }
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index 66b78241ce..e8c82de8de 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -359,14 +359,14 @@ static void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree)
 static void range_delete_callback(guint32 port)
 {
     if (port) {
-	dissector_delete("udp.port", port, sscop_handle);
+	dissector_delete_uint("udp.port", port, sscop_handle);
     }
 }
 
 static void range_add_callback(guint32 port)
 {
     if (port) {
-	dissector_add("udp.port", port, sscop_handle);
+	dissector_add_uint("udp.port", port, sscop_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index ecdf59ad3f..c48a041c08 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -273,7 +273,7 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 /*
  *	end of attaching data
  */
-	if (pinfo->destport == pinfo->match_port) {
+	if (pinfo->destport == pinfo->match_uint) {
 	  	is_response=FALSE;
 		if(!this_data) {
 			this_data = se_alloc(sizeof(struct ssh_pdu_data));
@@ -1265,5 +1265,5 @@ proto_reg_handoff_ssh(void)
 
 	ssh_handle = create_dissector_handle(dissect_ssh, proto_ssh);
 
-	dissector_add("tcp.port", TCP_PORT_SSH, ssh_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_SSH, ssh_handle);
 }
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 0211dee44d..0fa08b54a1 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -2947,9 +2947,9 @@ ssl_association_add(GTree* associations, dissector_handle_t handle, guint port,
     } else {
         if(port) {
             if(tcp)
-                dissector_add("tcp.port", port, handle);
+                dissector_add_uint("tcp.port", port, handle);
             else
-                dissector_add("udp.port", port, handle);
+                dissector_add_uint("udp.port", port, handle);
         }
         g_tree_insert(associations, assoc, assoc);
     }
@@ -2961,7 +2961,7 @@ ssl_association_remove(GTree* associations, SslAssociation *assoc)
     ssl_debug_printf("ssl_association_remove removing %s %u - %s handle %p\n",
                      (assoc->tcp)?"TCP":"UDP", assoc->ssl_port, assoc->info, (void *)(assoc->handle));
     if (assoc->handle)
-        dissector_delete((assoc->tcp)?"tcp.port":"udp.port", assoc->ssl_port, assoc->handle);
+        dissector_delete_uint((assoc->tcp)?"tcp.port":"udp.port", assoc->ssl_port, assoc->handle);
 
     g_free(assoc->info);
 
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 49cde99273..1153c1103d 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -1339,8 +1339,8 @@ proto_reg_handoff_stun(void)
 	stun_tcp_handle = create_dissector_handle(dissect_stun_tcp, proto_stun);
 	stun_udp_handle = new_create_dissector_handle(dissect_stun_udp, proto_stun);
 
-	dissector_add("tcp.port", TCP_PORT_STUN, stun_tcp_handle);
-	dissector_add("udp.port", UDP_PORT_STUN, stun_udp_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_STUN, stun_tcp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_STUN, stun_udp_handle);
 
 	heur_dissector_add("udp", dissect_stun_heur, proto_stun);
 	heur_dissector_add("tcp", dissect_stun_heur, proto_stun);
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 3c182e5227..d5772040dc 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -1987,9 +1987,9 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t
   {
     /* Try subdissectors (if we found a valid SSN on the current message) */
     if ((dest_ssn == INVALID_SSN ||
-       !dissector_try_port(sccp_ssn_dissector_table, dest_ssn, data_tvb, pinfo, tree))
+       !dissector_try_uint(sccp_ssn_dissector_table, dest_ssn, data_tvb, pinfo, tree))
        && (source_ssn == INVALID_SSN ||
-       !dissector_try_port(sccp_ssn_dissector_table, source_ssn, data_tvb, pinfo, tree)))
+       !dissector_try_uint(sccp_ssn_dissector_table, source_ssn, data_tvb, pinfo, tree)))
     {
 		/* try heuristic subdissector list to see if there are any takers */
 		if (dissector_try_heuristic(heur_subdissector_list, data_tvb, pinfo, tree)) {
@@ -2200,8 +2200,8 @@ proto_reg_handoff_sua(void)
   dissector_handle_t sua_handle;
 
   sua_handle = find_dissector("sua");
-  dissector_add("sctp.ppi",  SUA_PAYLOAD_PROTOCOL_ID, sua_handle);
-  dissector_add("sctp.port", SCTP_PORT_SUA,           sua_handle);
+  dissector_add_uint("sctp.ppi",  SUA_PAYLOAD_PROTOCOL_ID, sua_handle);
+  dissector_add_uint("sctp.port", SCTP_PORT_SUA,           sua_handle);
 
   data_handle = find_dissector("data");
   sccp_ssn_dissector_table = find_dissector_table("sccp.ssn");
diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index aaeccf4079..4e845e2e5f 100644
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -558,5 +558,5 @@ void proto_reg_handoff_sv(void) {
 	dissector_handle_t sv_handle;
 	sv_handle = find_dissector("sv");
 
-	dissector_add("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
 }
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index f045e83e40..3337e947e0 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -94,7 +94,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				6, 2, etypev2);
 		}
 		next_tvb = tvb_new_subset_remaining(tvb, 44);
-		dissector_try_port(ethertype_dissector_table, etypev2, next_tvb, pinfo,
+		dissector_try_uint(ethertype_dissector_table, etypev2, next_tvb, pinfo,
 			tree);
 	}
 
@@ -117,7 +117,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		 * tagging.
 		 */
 		next_tvb = tvb_new_subset_remaining(tvb, 56);
-		dissector_try_port(ethertype_dissector_table, etypev3, next_tvb, pinfo,
+		dissector_try_uint(ethertype_dissector_table, etypev3, next_tvb, pinfo,
 			tree);
 	}
 }
@@ -152,5 +152,5 @@ proto_reg_handoff_symantec(void)
 
 	symantec_handle = create_dissector_handle(dissect_symantec,
 	    proto_symantec);
-	dissector_add("wtap_encap", WTAP_ENCAP_SYMANTEC, symantec_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_SYMANTEC, symantec_handle);
 }
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index b474294b50..02931f183e 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -582,5 +582,5 @@ proto_reg_handoff_synergy(void)
 
 	dissector_handle_t synergy_handle;
 	synergy_handle = find_dissector("synergy");
-	dissector_add("tcp.port",24800, synergy_handle);
+	dissector_add_uint("tcp.port",24800, synergy_handle);
 }
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 05c963942a..451bb41ff8 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -1409,14 +1409,14 @@ void proto_reg_handoff_synphasor(void)
 	}
 	else {
 		/* update preferences */
-		dissector_delete("udp.port", current_udp_port, synphasor_udp_handle);
-		dissector_delete("tcp.port", current_tcp_port, synphasor_tcp_handle);
+		dissector_delete_uint("udp.port", current_udp_port, synphasor_udp_handle);
+		dissector_delete_uint("tcp.port", current_tcp_port, synphasor_tcp_handle);
 	}
 
 	current_udp_port = global_pref_udp_port;
 	current_tcp_port = global_pref_tcp_port;
 
-	dissector_add("udp.port", current_udp_port, synphasor_udp_handle);
-	dissector_add("tcp.port", current_tcp_port, synphasor_tcp_handle);
+	dissector_add_uint("udp.port", current_udp_port, synphasor_udp_handle);
+	dissector_add_uint("tcp.port", current_tcp_port, synphasor_tcp_handle);
 } /* proto_reg_handoff_synphasor() */
 
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index ff96e420db..810ac265ec 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -356,7 +356,7 @@ proto_reg_handoff_syslog(void)
   dissector_handle_t syslog_handle;
 
   syslog_handle = create_dissector_handle(dissect_syslog, proto_syslog);
-  dissector_add("udp.port", UDP_PORT_SYSLOG, syslog_handle);
+  dissector_add_uint("udp.port", UDP_PORT_SYSLOG, syslog_handle);
 
   /* Find the mtp3 dissector */
   mtp_handle = find_dissector("mtp3");
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 2a6790c70f..d0a9f8a255 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1455,14 +1455,14 @@ proto_reg_handoff_t38(void)
 		t38_prefs_initialized = TRUE;
 	}
 	else {
-		dissector_delete("tcp.port", tcp_port, t38_tcp_handle);
-		dissector_delete("udp.port", udp_port, t38_udp_handle);
+		dissector_delete_uint("tcp.port", tcp_port, t38_tcp_handle);
+		dissector_delete_uint("udp.port", udp_port, t38_udp_handle);
 	}
 	tcp_port = global_t38_tcp_port;
 	udp_port = global_t38_udp_port;
 
-	dissector_add("tcp.port", tcp_port, t38_tcp_handle);
-	dissector_add("udp.port", udp_port, t38_udp_handle);
+	dissector_add_uint("tcp.port", tcp_port, t38_tcp_handle);
+	dissector_add_uint("udp.port", udp_port, t38_udp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 898b63968a..1dc9c09738 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -313,7 +313,7 @@ proto_reg_handoff_tacacs(void)
 	dissector_handle_t tacacs_handle;
 
 	tacacs_handle = create_dissector_handle(dissect_tacacs, proto_tacacs);
-	dissector_add("udp.port", UDP_PORT_TACACS, tacacs_handle);
+	dissector_add_uint("udp.port", UDP_PORT_TACACS, tacacs_handle);
 }
 
 static int proto_tacplus = -1;
@@ -955,7 +955,7 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		 tvb, 0, -1, "TACACS+");
 
 		tacplus_tree = proto_item_add_subtree(ti, ett_tacplus);
-		if (pinfo->match_port == pinfo->destport)
+		if (pinfo->match_uint == pinfo->destport)
 		{
 			hidden_item = proto_tree_add_boolean(tacplus_tree,
 			    hf_tacplus_request, tvb, 0, 0, TRUE);
@@ -1111,7 +1111,7 @@ proto_reg_handoff_tacplus(void)
 
 	tacplus_handle = create_dissector_handle(dissect_tacplus,
 	    proto_tacplus);
-	dissector_add("tcp.port", TCP_PORT_TACACS, tacplus_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TACACS, tacplus_handle);
 }
 
 
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 2dddd70e8d..cef3577f13 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -618,6 +618,6 @@ proto_reg_handoff_tapa(void)
 	dissector_handle_t tapa_handle;
 
 	tapa_handle = find_dissector("tapa");
-	dissector_add("udp.port", PORT_TAPA, tapa_handle);
+	dissector_add_uint("udp.port", PORT_TAPA, tapa_handle);
 }
 
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 57fe1d24b4..e25d0a8eae 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -227,23 +227,23 @@ static void dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
 
 extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(itu_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_itu_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn",ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 extern void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(itu_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_ansi_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn", ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn", ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
@@ -1996,14 +1996,14 @@ proto_register_tcap(void)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_delete("sccp.ssn", ssn, tcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_add("sccp.ssn", ssn, tcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
@@ -2160,7 +2160,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 				  p_tcap_context->subdissector_present=TRUE;
 			  } else {
 			    /* Not found, so try to find a subdissector according to SSN */
-			    if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+			    if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			      /* Found according to SSN */
 			      p_tcap_context->subdissector_handle=subdissector_handle;
 			      p_tcap_context->subdissector_present=TRUE;
@@ -2206,7 +2206,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
       } else {
 		  /* Search if we can found the sub protocol according to the SSN table */
 		  if ( (subdissector_handle
-			  = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+			  = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			  /* Found according to SSN */
 			  is_subdissector=TRUE;
 		  } else {
@@ -2217,7 +2217,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 	  } /* ACN */
 	} else {
 		/* There is no A.C.N for this transaction, so search in the SSN table */
-		if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+		if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
 			/* Found according to SSN */
 			is_subdissector=TRUE;
 		} else {
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index c618710354..eb3ffb5abf 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3415,12 +3415,12 @@ decode_tcp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,
         high_port = dst_port;
     }
     if (low_port != 0 &&
-        dissector_try_port(subdissector_table, low_port, next_tvb, pinfo, tree)){
+        dissector_try_uint(subdissector_table, low_port, next_tvb, pinfo, tree)){
         pinfo->want_pdu_tracking -= !!(pinfo->want_pdu_tracking);
         return TRUE;
     }
     if (high_port != 0 &&
-        dissector_try_port(subdissector_table, high_port, next_tvb, pinfo, tree)){
+        dissector_try_uint(subdissector_table, high_port, next_tvb, pinfo, tree)){
         pinfo->want_pdu_tracking -= !!(pinfo->want_pdu_tracking);
         return TRUE;
     }
@@ -4932,7 +4932,7 @@ proto_reg_handoff_tcp(void)
     dissector_handle_t tcp_handle;
 
     tcp_handle = create_dissector_handle(dissect_tcp, proto_tcp);
-    dissector_add("ip.proto", IP_PROTO_TCP, tcp_handle);
+    dissector_add_uint("ip.proto", IP_PROTO_TCP, tcp_handle);
     data_handle = find_dissector("data");
     tcp_tap = register_tap("tcp");
 }
diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c
index f9403331fe..399c996f6c 100644
--- a/epan/dissectors/packet-tdmoe.c
+++ b/epan/dissectors/packet-tdmoe.c
@@ -166,7 +166,7 @@ proto_reg_handoff_tdmoe(void)
 	dissector_handle_t tdmoe_handle;
 
 	tdmoe_handle = new_create_dissector_handle(dissect_tdmoe, proto_tdmoe);
-	dissector_add("ethertype", ETHERTYPE_TDMOE, tdmoe_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_TDMOE, tdmoe_handle);
 
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index f9fe5bbe63..9d3979ff50 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -3124,8 +3124,8 @@ proto_reg_handoff_tds(void)
     tds_tcp_handle = create_dissector_handle(dissect_tds_tcp, proto_tds);
 
     /* Initial TDS ports: MS SQL default ports */
-    dissector_add("tcp.port", 1433, tds_tcp_handle);
-    dissector_add("tcp.port", 2433, tds_tcp_handle);
+    dissector_add_uint("tcp.port", 1433, tds_tcp_handle);
+    dissector_add_uint("tcp.port", 2433, tds_tcp_handle);
 
     heur_dissector_add("tcp", dissect_tds_tcp_heur, proto_tds);
 
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 946f64044b..f3e05c6c2d 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -1218,6 +1218,6 @@ void proto_reg_handoff_ts2(void)
 {
 	dissector_handle_t ts2_handle;
 	ts2_handle = create_dissector_handle(dissect_ts2, proto_ts2);
-	dissector_add("udp.port", TS2_PORT, ts2_handle);
+	dissector_add_uint("udp.port", TS2_PORT, ts2_handle);
 }
 
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index e86ccef523..75347901b7 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -138,5 +138,5 @@ proto_reg_handoff_teimanagement(void)
 
     teimanagement_handle = create_dissector_handle(dissect_teimanagement,
         proto_tei);
-    dissector_add("lapd.sapi", LAPD_SAPI_L2, teimanagement_handle);
+    dissector_add_uint("lapd.sapi", LAPD_SAPI_L2, teimanagement_handle);
 }
diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c
index de74c8f863..f84eacfc80 100644
--- a/epan/dissectors/packet-telkonet.c
+++ b/epan/dissectors/packet-telkonet.c
@@ -110,5 +110,5 @@ proto_reg_handoff_telkonet(void)
 	eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
 	telkonet_handle = create_dissector_handle(dissect_telkonet, proto_telkonet);
-	dissector_add("ethertype", ETHERTYPE_TELKONET, telkonet_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_TELKONET, telkonet_handle);
 }
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 2a47d8e239..3701dffeff 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -2013,7 +2013,7 @@ proto_reg_handoff_telnet(void)
 	dissector_handle_t telnet_handle;
 
 	telnet_handle = create_dissector_handle(dissect_telnet, proto_telnet);
-	dissector_add("tcp.port", TCP_PORT_TELNET, telnet_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TELNET, telnet_handle);
 	tn3270_handle = find_dissector("tn3270");
     tn5250_handle = find_dissector("tn5250");
 }
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index bbb23cb423..ef7b74e472 100644
--- a/epan/dissectors/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
@@ -207,7 +207,7 @@ decode_teredo_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,proto_tree *tr
 
 	next_tvb = tvb_new_subset_remaining(tvb, offset);
 
-	if (dissector_try_port(teredo_dissector_table, th_header, next_tvb, pinfo, tree))
+	if (dissector_try_uint(teredo_dissector_table, th_header, next_tvb, pinfo, tree))
 		return;
 
 	call_dissector(data_handle,next_tvb, pinfo, tree);  
@@ -423,7 +423,7 @@ proto_reg_handoff_teredo(void)
 	data_handle   = find_dissector("ipv6");
 	teredo_tap    = register_tap("teredo");
 
-	dissector_add("udp.port", UDP_PORT_TEREDO, teredo_handle);
+	dissector_add_uint("udp.port", UDP_PORT_TEREDO, teredo_handle);
 	heur_dissector_add("udp", dissect_teredo_heur, proto_teredo);
 }
 
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index aabddc8f07..0757155db4 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -531,12 +531,12 @@ proto_register_tftp(void)
 
 static void range_delete_callback (guint32 port)
 {
-    dissector_delete ("udp.port", port, tftp_handle);
+    dissector_delete_uint ("udp.port", port, tftp_handle);
 }
 
 static void range_add_callback (guint32 port)
 {
-    dissector_add ("udp.port", port, tftp_handle);
+    dissector_add_uint ("udp.port", port, tftp_handle);
 }
 
 void
diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c
index d2b4582a43..963f1202e3 100644
--- a/epan/dissectors/packet-time.c
+++ b/epan/dissectors/packet-time.c
@@ -50,7 +50,7 @@ dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   if (check_col(pinfo->cinfo, COL_INFO)) {
     col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s",
-		 pinfo->srcport == pinfo->match_port ? "Response":"Request");
+		 pinfo->srcport == pinfo->match_uint ? "Response":"Request");
   }
 
   if (tree) {
@@ -95,6 +95,6 @@ proto_reg_handoff_time(void)
   dissector_handle_t time_handle;
 
   time_handle = create_dissector_handle(dissect_time, proto_time);
-  dissector_add("udp.port", TIME_PORT, time_handle);
-  dissector_add("tcp.port", TIME_PORT, time_handle);
+  dissector_add_uint("udp.port", TIME_PORT, time_handle);
+  dissector_add_uint("tcp.port", TIME_PORT, time_handle);
 }
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index f1ccb24a29..9e91415d5d 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -1563,7 +1563,7 @@ call_tipc_v2_data_subdissectors(tvbuff_t *data_tvb, packet_info *pinfo, guint32
 		}
 		/* This triggers if a dissectors if
 		 * tipc.user is just set to a TIPC user holding data */
-		if (dissector_try_port(tipc_user_dissector, user, data_tvb, pinfo, top_tree))
+		if (dissector_try_uint(tipc_user_dissector, user, data_tvb, pinfo, top_tree))
 			return;
 		/* The Name Type is not always explicitly set in a TIPC Data
 		 * Message.
@@ -1597,7 +1597,7 @@ call_tipc_v2_data_subdissectors(tvbuff_t *data_tvb, packet_info *pinfo, guint32
 		 * some kind of static function which port name type a message
 		 * is going to, if it is not specified explicitly in a message */
 		if (name_type_p)
-			if (dissector_try_port(tipc_type_dissector, *name_type_p, data_tvb, pinfo, top_tree))
+			if (dissector_try_uint(tipc_type_dissector, *name_type_p, data_tvb, pinfo, top_tree))
 				return;
 		/* check for heuristic dissectors if specified in the
 		 * preferences not to try them first */
@@ -2957,16 +2957,16 @@ proto_reg_handoff_tipc(void)
 		ip_handle = find_dissector("ip");
 		data_handle = find_dissector("data");
 
-		dissector_add("ethertype", ETHERTYPE_TIPC, tipc_handle);
+		dissector_add_uint("ethertype", ETHERTYPE_TIPC, tipc_handle);
 
 		inited = TRUE;
 	} else {
 		/* change TIPC-over-TCP port if changed in the preferences */
 		if (tipc_alternate_tcp_port != tipc_alternate_tcp_port_prev) {
 			if (tipc_alternate_tcp_port_prev != 0)
-				dissector_delete("tcp.port", tipc_alternate_tcp_port_prev, tipc_tcp_handle);
+				dissector_delete_uint("tcp.port", tipc_alternate_tcp_port_prev, tipc_tcp_handle);
 			if (tipc_alternate_tcp_port != 0)
-				dissector_add("tcp.port", tipc_alternate_tcp_port, tipc_tcp_handle);
+				dissector_add_uint("tcp.port", tipc_alternate_tcp_port, tipc_tcp_handle);
 			tipc_alternate_tcp_port_prev = tipc_alternate_tcp_port;
 		}
 	}
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 74b484d3f7..3c8beb4ee6 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -260,6 +260,6 @@ proto_reg_handoff_tivoconnect(void)
     dissector_handle_t tivoconnect_handle;
 
     tivoconnect_handle = new_create_dissector_handle(dissect_tivoconnect, proto_tivoconnect);
-    dissector_add("udp.port", 2190, tivoconnect_handle);
-    dissector_add("tcp.port", 2190, tivoconnect_handle);
+    dissector_add_uint("udp.port", 2190, tivoconnect_handle);
+    dissector_add_uint("tcp.port", 2190, tivoconnect_handle);
 }
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index d3298208df..2208369b49 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -842,5 +842,5 @@ proto_reg_handoff_tnef(void)
   /* X.400 file transfer bodypart */
   register_ber_oid_dissector("1.2.840.113556.3.10.1", dissect_tnef, proto_tnef, "id-et-tnef");
 
-  dissector_add("wtap_encap", WTAP_ENCAP_TNEF, tnef_file_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_TNEF, tnef_file_handle);
 }
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 1a02ff53b1..924b3e26eb 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -889,7 +889,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
 		col_set_str(pinfo->cinfo, COL_INFO,
-			(pinfo->match_port == pinfo->destport) ? "Request" : "Response");
+			(pinfo->match_uint == pinfo->destport) ? "Request" : "Response");
 	}
 
 	if (tree)
@@ -897,7 +897,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ti = proto_tree_add_item(tree, proto_tns, tvb, 0, -1, FALSE);
 		tns_tree = proto_item_add_subtree(ti, ett_tns);
 
-		if (pinfo->match_port == pinfo->destport)
+		if (pinfo->match_uint == pinfo->destport)
 		{
 			hidden_item = proto_tree_add_boolean(tns_tree, hf_tns_request,
 					   tvb, offset, 0, TRUE);
@@ -1333,6 +1333,6 @@ proto_reg_handoff_tns(void)
 	dissector_handle_t tns_handle;
 
 	tns_handle = new_create_dissector_handle(dissect_tns, proto_tns);
-	dissector_add("tcp.port", TCP_PORT_TNS, tns_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TNS, tns_handle);
 	data_handle = find_dissector("data");
 }
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 1228d37fe2..40ddb58a74 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -680,15 +680,15 @@ proto_reg_handoff_tpkt(void)
 
 	osi_tp_handle = find_dissector("ositp");
 	tpkt_handle = find_dissector("tpkt");
-	dissector_add("tcp.port", TCP_PORT_TPKT, tpkt_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TPKT, tpkt_handle);
 
 	x224_handle = find_dissector("x224");
 	tpkt_x224_handle = create_dissector_handle(dissect_tpkt_x224, proto_tpkt);
-	dissector_add("tcp.port", TCP_PORT_TPKT_X224, tpkt_x224_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TPKT_X224, tpkt_x224_handle);
 
 	/*
 	tpkt_ascii_handle = create_dissector_handle(dissect_ascii_tpkt, proto_tpkt);
-	dissector_add("tcp.port", TCP_PORT_TPKT, tpkt_ascii_handle);
+	dissector_add_uint("tcp.port", TCP_PORT_TPKT, tpkt_ascii_handle);
 	*/
 
 }
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index 9c2e67c5df..f5b4411a05 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -722,10 +722,10 @@ void proto_reg_handoff_tpncp(void) {
         tpncp_prefs_initialized = TRUE;
     }
     else {
-        dissector_delete("tcp.port", trunkpack_tcp_port, tpncp_tcp_handle);
-        dissector_delete("udp.port", trunkpack_udp_port, tpncp_udp_handle);
-        dissector_delete("tcp.port", host_tcp_port,      tpncp_tcp_handle);
-        dissector_delete("udp.port", host_udp_port,      tpncp_udp_handle);
+        dissector_delete_uint("tcp.port", trunkpack_tcp_port, tpncp_tcp_handle);
+        dissector_delete_uint("udp.port", trunkpack_udp_port, tpncp_udp_handle);
+        dissector_delete_uint("tcp.port", host_tcp_port,      tpncp_tcp_handle);
+        dissector_delete_uint("udp.port", host_udp_port,      tpncp_udp_handle);
     }
 
     trunkpack_tcp_port = global_tpncp_trunkpack_tcp_port;
@@ -734,8 +734,8 @@ void proto_reg_handoff_tpncp(void) {
     host_tcp_port = global_tpncp_host_tcp_port;
     host_udp_port = global_tpncp_host_udp_port;
 
-    dissector_add("tcp.port", global_tpncp_trunkpack_tcp_port, tpncp_tcp_handle);
-    dissector_add("udp.port", global_tpncp_trunkpack_udp_port, tpncp_udp_handle);
+    dissector_add_uint("tcp.port", global_tpncp_trunkpack_tcp_port, tpncp_tcp_handle);
+    dissector_add_uint("udp.port", global_tpncp_trunkpack_udp_port, tpncp_udp_handle);
 }
 
 /*-------------------------------------------------------------------------------------------------------------------------------------------*/
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 04420b6cac..3648e7df02 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -752,5 +752,5 @@ proto_reg_handoff_tr(void)
 	data_handle = find_dissector("data");
 
 	tr_handle = find_dissector("tr");
-	dissector_add("wtap_encap", WTAP_ENCAP_TOKEN_RING, tr_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_TOKEN_RING, tr_handle);
 }
diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c
index 1841cfc570..d428544195 100644
--- a/epan/dissectors/packet-trill.c
+++ b/epan/dissectors/packet-trill.c
@@ -200,7 +200,7 @@ proto_reg_handoff_trill(void)
   dissector_handle_t trill_handle;
 
   trill_handle = new_create_dissector_handle(dissect_trill, proto_trill);
-  dissector_add("ethertype", ETHERTYPE_TRILL, trill_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_TRILL, trill_handle);
 
   eth_dissector = find_dissector( "eth" ) ;
 }
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index c4697f9322..5c28b6c4c1 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -174,7 +174,7 @@ proto_reg_handoff_tsp(void)
 	dissector_handle_t	tsp_handle;
 
 	tsp_handle = create_dissector_handle(dissect_tsp, proto_tsp);
-	dissector_add("udp.port", UDP_PORT_TIMED, tsp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_TIMED, tsp_handle);
 }
 
 
diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c
index 80523c9be9..4b66f5f767 100644
--- a/epan/dissectors/packet-tte-pcf.c
+++ b/epan/dissectors/packet-tte-pcf.c
@@ -221,7 +221,7 @@ proto_reg_handoff_tte_pcf(void)
     /* initialize the pcf handle */
     tte_pcf_handle = find_dissector("tte_pcf");
 
-    dissector_add("ethertype", ETHERTYPE_TTE_PCF, tte_pcf_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_TTE_PCF, tte_pcf_handle);
 
 }
 
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index 88f3bd528d..4f6f1448b0 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -300,7 +300,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (encapsulation != 0) {
 		wtap_encap = tzsp_encap_to_wtap_encap(encapsulation);
 		if (wtap_encap != -1 &&
-		    (encap_dissector = dissector_get_port_handle(encap_dissector_table, wtap_encap))) {
+		    (encap_dissector = dissector_get_uint_handle(encap_dissector_table, wtap_encap))) {
 			encap_name = dissector_handle_get_short_name(encap_dissector);
 		}
 		else {
@@ -339,7 +339,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		next_tvb = tvb_new_subset_remaining(tvb, pos);
 		if (encapsulation != 0
 		    && (wtap_encap == -1
-			|| !dissector_try_port(encap_dissector_table, wtap_encap,
+			|| !dissector_try_uint(encap_dissector_table, wtap_encap,
 				next_tvb, pinfo, tree))) {
 
 			col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
@@ -507,13 +507,13 @@ proto_reg_handoff_tzsp(void)
 	dissector_handle_t tzsp_handle;
 
 	tzsp_handle = create_dissector_handle(dissect_tzsp, proto_tzsp);
-	dissector_add("udp.port", UDP_PORT_TZSP, tzsp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_TZSP, tzsp_handle);
 
 	/* Get the data dissector for handling unknown encapsulation types. */
 	data_handle = find_dissector("data");
 
 	/* Register this protocol as an ecapsulation type. */
-	dissector_add("wtap_encap", WTAP_ENCAP_TZSP, tzsp_handle);
+	dissector_add_uint("wtap_encap", WTAP_ENCAP_TZSP, tzsp_handle);
 
 	encap_dissector_table = find_dissector_table("wtap_encap");
 }
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c
index 790f48cb0c..fa9a084bdf 100644
--- a/epan/dissectors/packet-udld.c
+++ b/epan/dissectors/packet-udld.c
@@ -296,6 +296,6 @@ proto_reg_handoff_udld(void)
 
     data_handle = find_dissector("data");
     udld_handle = create_dissector_handle(dissect_udld, proto_udld);
-    dissector_add("llc.cisco_pid", 0x0111, udld_handle);
-    dissector_add("chdlctype", 0x0111, udld_handle);
+    dissector_add_uint("llc.cisco_pid", 0x0111, udld_handle);
+    dissector_add_uint("chdlctype", 0x0111, udld_handle);
 }
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index a4fbf62b68..8990de95a8 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -270,10 +270,10 @@ decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,
     high_port = uh_dport;
   }
   if (low_port != 0 &&
-      dissector_try_port(udp_dissector_table, low_port, next_tvb, pinfo, tree))
+      dissector_try_uint(udp_dissector_table, low_port, next_tvb, pinfo, tree))
     return;
   if (high_port != 0 &&
-      dissector_try_port(udp_dissector_table, high_port, next_tvb, pinfo, tree))
+      dissector_try_uint(udp_dissector_table, high_port, next_tvb, pinfo, tree))
     return;
 
   if (!try_heuristic_first) {
@@ -725,9 +725,9 @@ proto_reg_handoff_udp(void)
 	dissector_handle_t udplite_handle;
 
 	udp_handle = find_dissector("udp");
-	dissector_add("ip.proto", IP_PROTO_UDP, udp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_UDP, udp_handle);
 	udplite_handle = create_dissector_handle(dissect_udplite, proto_udplite);
-	dissector_add("ip.proto", IP_PROTO_UDPLITE, udplite_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_UDPLITE, udplite_handle);
 	data_handle = find_dissector("data");
 	udp_tap = register_tap("udp");
 	udp_follow_tap = register_tap("udp_follow");
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index b4e75c1170..fdaae0b373 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -8857,11 +8857,11 @@ proto_reg_handoff_ulp(void)
 		rrlp_handle = find_dissector("rrlp");
 		initialized = TRUE;
 	} else {
-		dissector_delete("tcp.port", local_ulp_port, ulp_handle);
+		dissector_delete_uint("tcp.port", local_ulp_port, ulp_handle);
 	}
 
 	local_ulp_port = gbl_ulp_port;
-	dissector_add("tcp.port", gbl_ulp_port, ulp_handle);
+	dissector_add_uint("tcp.port", gbl_ulp_port, ulp_handle);
 
 	/* application/oma-supl-ulp */
 
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 2c1e7ad95c..998a48dafa 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -1132,7 +1132,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_protocol_discriminator, tvb, ie_offset, 1, FALSE);
 		proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, FALSE);
 		l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len );
-		if  (!dissector_try_port(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree))
+		if  (!dissector_try_uint(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree))
 		   		call_dissector(data_handle, l3_tvb, pinfo, urr_ie_tree);
 		break;
 	case 27:
@@ -1176,7 +1176,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		proto_tree_add_item(urr_ie_tree, hf_uma_urr_L3_Message, tvb, ie_offset, ie_len, FALSE);
 		/* XXX the dissector to call should depend on the RAT type ??? */
 		l3_tvb = tvb_new_subset(tvb, ie_offset,ie_len, ie_len );
-		if  (!dissector_try_port(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree))
+		if  (!dissector_try_uint(bssap_pdu_type_table,BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, urr_ie_tree))
 		   		call_dissector(data_handle, l3_tvb, pinfo, urr_ie_tree);
 		break;
 	case 33:		
@@ -1820,13 +1820,13 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 range_delete_callback(guint32 port)
 {
-    dissector_delete("tcp.port", port, uma_tcp_handle);
+    dissector_delete_uint("tcp.port", port, uma_tcp_handle);
 }
 
 static void
 range_add_callback(guint32 port)
 {
-    dissector_add("tcp.port", port, uma_tcp_handle);
+    dissector_add_uint("tcp.port", port, uma_tcp_handle);
 }
 
 /* Register the protocol with Wireshark */
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index 958abf0748..a65c1da3bd 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -1056,5 +1056,5 @@ proto_reg_handoff_usb_hid(void) {
 	dissector_handle_t usb_hid_control_handle;
 
 	usb_hid_control_handle = new_create_dissector_handle(dissect_usb_hid_control, proto_usb_hid);
-	dissector_add("usb.control", IF_CLASS_HID, usb_hid_control_handle);
+	dissector_add_uint("usb.control", IF_CLASS_HID, usb_hid_control_handle);
 }
diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c
index 657a68e9f9..d9e0f7c0e4 100644
--- a/epan/dissectors/packet-usb-hub.c
+++ b/epan/dissectors/packet-usb-hub.c
@@ -673,6 +673,6 @@ proto_reg_handoff_usb_hub(void) {
 	dissector_handle_t usb_hub_control_handle;
 
 	usb_hub_control_handle = new_create_dissector_handle(dissect_usb_hub_control, proto_usb_hub);
-	dissector_add("usb.control", IF_CLASS_HUB, usb_hub_control_handle);
-	dissector_add("usb.control", IF_CLASS_UNKNOWN, usb_hub_control_handle);
+	dissector_add_uint("usb.control", IF_CLASS_HUB, usb_hub_control_handle);
+	dissector_add_uint("usb.control", IF_CLASS_UNKNOWN, usb_hub_control_handle);
 }
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index fc333ac2f4..7b08e0ed11 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -444,8 +444,8 @@ proto_reg_handoff_usb_ms(void)
     dissector_handle_t usb_ms_control_handle;
 
     usb_ms_bulk_handle = find_dissector("usbms");
-    dissector_add("usb.bulk", IF_CLASS_MASSTORAGE, usb_ms_bulk_handle);
+    dissector_add_uint("usb.bulk", IF_CLASS_MASSTORAGE, usb_ms_bulk_handle);
 
     usb_ms_control_handle = new_create_dissector_handle(dissect_usb_ms_control, proto_usb_ms);
-    dissector_add("usb.control", IF_CLASS_MASSTORAGE, usb_ms_control_handle);
+    dissector_add_uint("usb.control", IF_CLASS_MASSTORAGE, usb_ms_control_handle);
 }
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 8246b339a2..e87619b9a2 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -2010,7 +2010,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
 
             pinfo->usb_conv_info=usb_conv_info;
             next_tvb=tvb_new_subset_remaining(tvb, offset);
-            if(dissector_try_port(usb_bulk_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, parent)){
+            if(dissector_try_uint(usb_bulk_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, parent)){
                 return;
             }
         }
@@ -2084,7 +2084,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
                 case RQT_SETUP_TYPE_CLASS:
                     /* Try to find a class specific dissector */
                     next_tvb=tvb_new_subset_remaining(tvb, offset);
-                    if(dissector_try_port(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
+                    if(dissector_try_uint(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
                         return;
                     }
                     /* Else no class dissector, just display generic fields */
@@ -2137,7 +2137,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
             if(usb_trans_info){
                 /* Try to find a class specific dissector */
                 next_tvb=tvb_new_subset_remaining(tvb, offset);
-                if(dissector_try_port(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
+                if(dissector_try_uint(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
                     return;
                 }
 
@@ -2759,6 +2759,6 @@ proto_reg_handoff_usb(void)
     linux_usb_mmapped_handle = create_dissector_handle(dissect_linux_usb_mmapped,
                                                        proto_usb);
 
-    dissector_add("wtap_encap", WTAP_ENCAP_USB_LINUX, linux_usb_handle);
-    dissector_add("wtap_encap", WTAP_ENCAP_USB_LINUX_MMAPPED, linux_usb_mmapped_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_USB_LINUX, linux_usb_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_USB_LINUX_MMAPPED, linux_usb_mmapped_handle);
 }
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 7b7d93d3fc..ae285b1649 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -90,7 +90,7 @@ static void dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
 	guint i;
 	
 	for (i = 0; i < num_encaps; i++) {
-		if (encaps[i].encap == pinfo->match_port) {
+		if (encaps[i].encap == pinfo->match_uint) {
 			encap = &(encaps[i]);
 			break;
 		}
@@ -99,14 +99,14 @@ static void dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
 	item = proto_tree_add_item(tree,proto_user_encap,tvb,0,0,FALSE);
 	if (!encap) {
 		char* msg = ep_strdup_printf("User encapsulation not handled: DLT=%d, check your Preferences->Protocols->DLT_USER",
-									 pinfo->match_port + 147 - WTAP_ENCAP_USER0);
+									 pinfo->match_uint + 147 - WTAP_ENCAP_USER0);
 		proto_item_set_text(item,"%s",msg);
 		expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "%s", msg);
 		
 		call_dissector(data_handle, tvb, pinfo, tree);
 		return;
 	} else {
-		proto_item_set_text(item,"DLT: %d",pinfo->match_port + 147 - WTAP_ENCAP_USER0);
+		proto_item_set_text(item,"DLT: %d",pinfo->match_uint + 147 - WTAP_ENCAP_USER0);
 	}
 
 	len = tvb_reported_length(tvb) - (encap->header_size + encap->trailer_size);
@@ -164,7 +164,7 @@ void proto_reg_handoff_user_encap(void)
 	data_handle = find_dissector("data");
 	
 	for (i = WTAP_ENCAP_USER0 ; i <= WTAP_ENCAP_USER15; i++)
-		dissector_add("wtap_encap", i, user_encap_handle);
+		dissector_add_uint("wtap_encap", i, user_encap_handle);
 
 }
 
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index 9070b30dcf..b11b13193d 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -1721,7 +1721,7 @@ proto_reg_handoff_v5ua(void)
 	q931_handle = find_dissector("q931");
 	v52_handle = find_dissector("v52");
 
-	dissector_add("sctp.port", SCTP_PORT_V5UA_DRAFT, v5ua_handle);
-	dissector_add("sctp.port", SCTP_PORT_V5UA_RFC, v5ua_handle);
-	dissector_add("sctp.ppi",  V5UA_PAYLOAD_PROTOCOL_ID, v5ua_handle);
+	dissector_add_uint("sctp.port", SCTP_PORT_V5UA_DRAFT, v5ua_handle);
+	dissector_add_uint("sctp.port", SCTP_PORT_V5UA_RFC, v5ua_handle);
+	dissector_add_uint("sctp.ppi",  V5UA_PAYLOAD_PROTOCOL_ID, v5ua_handle);
 }
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c
index df3f4923e8..c0e7d11bb3 100644
--- a/epan/dissectors/packet-vicp.c
+++ b/epan/dissectors/packet-vicp.c
@@ -119,5 +119,5 @@ void proto_reg_handoff_vicp(void)
 {  dissector_handle_t vicp_handle;
 
    vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp);
-   dissector_add("tcp.port", VICP_PORT, vicp_handle);
+   dissector_add_uint("tcp.port", VICP_PORT, vicp_handle);
 }
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index 9d36ea43ef..f798db39c1 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -180,11 +180,11 @@ proto_reg_handoff_vines_frp(void)
 
 	vines_frp_handle = create_dissector_handle(dissect_vines_frp,
 	    proto_vines_frp);
-	dissector_add("ip.proto", IP_PROTO_VINES, vines_frp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_VINES, vines_frp_handle);
 
 	/* XXX: AFAIK, src and dst port must be the same; should
 	   the dissector check for that? */
-	dissector_add("udp.port", UDP_PORT_VINES, vines_frp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_VINES, vines_frp_handle);
 }
 
 static dissector_table_t vines_llc_dissector_table;
@@ -227,7 +227,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 
 	next_tvb = tvb_new_subset_remaining(tvb, 1);
-	if (!dissector_try_port(vines_llc_dissector_table, ptype,
+	if (!dissector_try_uint(vines_llc_dissector_table, ptype,
 	    next_tvb, pinfo, tree))
 		call_dissector(data_handle, next_tvb, pinfo, tree);
 }
@@ -255,7 +255,7 @@ proto_reg_handoff_vines_llc(void)
 
 	vines_llc_handle = create_dissector_handle(dissect_vines_llc,
 	    proto_vines_llc);
-	dissector_add("llc.dsap", SAP_VINES2, vines_llc_handle);
+	dissector_add_uint("llc.dsap", SAP_VINES2, vines_llc_handle);
 }
 
 static dissector_table_t vines_ip_dissector_table;
@@ -385,7 +385,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	offset += 18;
 	next_tvb = tvb_new_subset_remaining(tvb, offset);
-	if (!dissector_try_port(vines_ip_dissector_table, viph.vip_proto,
+	if (!dissector_try_uint(vines_ip_dissector_table, viph.vip_proto,
 	    next_tvb, pinfo, tree))
 		call_dissector(data_handle, next_tvb, pinfo, tree);
 }
@@ -421,11 +421,11 @@ proto_register_vines_ip(void)
 void
 proto_reg_handoff_vines_ip(void)
 {
-	dissector_add("ethertype", ETHERTYPE_VINES_IP, vines_ip_handle);
-	dissector_add("ppp.protocol", PPP_VINES, vines_ip_handle);
-	dissector_add("arcnet.protocol_id", ARCNET_PROTO_BANYAN,
+	dissector_add_uint("ethertype", ETHERTYPE_VINES_IP, vines_ip_handle);
+	dissector_add_uint("ppp.protocol", PPP_VINES, vines_ip_handle);
+	dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_BANYAN,
 	    vines_ip_handle);
-	dissector_add("vines_llc.ptype", VINES_LLC_IP, vines_ip_handle);
+	dissector_add_uint("vines_llc.ptype", VINES_LLC_IP, vines_ip_handle);
 	data_handle = find_dissector("data");
 }
 
@@ -465,8 +465,8 @@ proto_reg_handoff_vines_echo(void)
 
 	vines_echo_handle = create_dissector_handle(dissect_vines_echo,
 	    proto_vines_echo);
-	dissector_add("vines_llc.ptype", VINES_LLC_ECHO, vines_echo_handle);
-	dissector_add("ethertype", ETHERTYPE_VINES_ECHO, vines_echo_handle);
+	dissector_add_uint("vines_llc.ptype", VINES_LLC_ECHO, vines_echo_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_VINES_ECHO, vines_echo_handle);
 }
 
 static const value_string pkttype_vals[] = {
@@ -695,7 +695,7 @@ proto_reg_handoff_vines_ipc(void)
 
 	vines_ipc_handle = create_dissector_handle(dissect_vines_ipc,
 	    proto_vines_ipc);
-	dissector_add("vines_ip.protocol", VIP_PROTO_IPC, vines_ipc_handle);
+	dissector_add_uint("vines_ip.protocol", VIP_PROTO_IPC, vines_ipc_handle);
 }
 
 static heur_dissector_list_t vines_spp_heur_subdissector_list;
@@ -822,7 +822,7 @@ proto_reg_handoff_vines_spp(void)
 
 	vines_spp_handle = create_dissector_handle(dissect_vines_spp,
 	    proto_vines_spp);
-	dissector_add("vines_ip.protocol", VIP_PROTO_SPP, vines_spp_handle);
+	dissector_add_uint("vines_ip.protocol", VIP_PROTO_SPP, vines_spp_handle);
 }
 
 #define VINES_VERS_PRE_5_5	0x00
@@ -969,7 +969,7 @@ proto_reg_handoff_vines_arp(void)
 
 	vines_arp_handle = create_dissector_handle(dissect_vines_arp,
 	    proto_vines_arp);
-	dissector_add("vines_ip.protocol", VIP_PROTO_ARP, vines_arp_handle);
+	dissector_add_uint("vines_ip.protocol", VIP_PROTO_ARP, vines_arp_handle);
 }
 
 #define VRTP_OP_REQUEST		0x01
@@ -1515,7 +1515,7 @@ proto_reg_handoff_vines_rtp(void)
 
 	vines_rtp_handle = create_dissector_handle(dissect_vines_rtp,
 	    proto_vines_rtp);
-	dissector_add("vines_ip.protocol", VIP_PROTO_RTP, vines_rtp_handle);
+	dissector_add_uint("vines_ip.protocol", VIP_PROTO_RTP, vines_rtp_handle);
 }
 
 #define VICP_EXCEPTION_NOTIFICATION	0x0000
@@ -1633,5 +1633,5 @@ proto_reg_handoff_vines_icp(void)
 
 	vines_icp_handle = create_dissector_handle(dissect_vines_icp,
 	    proto_vines_icp);
-	dissector_add("vines_ip.protocol", VIP_PROTO_ICP, vines_icp_handle);
+	dissector_add_uint("vines_ip.protocol", VIP_PROTO_ICP, vines_icp_handle);
 }
diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c
index e28e44210e..833fcf566d 100644
--- a/epan/dissectors/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
@@ -878,10 +878,10 @@ proto_reg_handoff_vj(void)
   dissector_handle_t vjuc_handle;
 
   vjc_handle = create_dissector_handle(dissect_vjc, proto_vj);
-  dissector_add("ppp.protocol", PPP_VJC_COMP, vjc_handle);
+  dissector_add_uint("ppp.protocol", PPP_VJC_COMP, vjc_handle);
 
   vjuc_handle = create_dissector_handle(dissect_vjuc, proto_vj);
-  dissector_add("ppp.protocol", PPP_VJC_UNCOMP, vjuc_handle);
+  dissector_add_uint("ppp.protocol", PPP_VJC_UNCOMP, vjuc_handle);
 
   ip_handle = find_dissector("ip");
   data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c
index 7b89ead826..ce2e0a77a6 100644
--- a/epan/dissectors/packet-vmlab.c
+++ b/epan/dissectors/packet-vmlab.c
@@ -181,5 +181,5 @@ proto_reg_handoff_vmlab(void)
 
     vmlab_handle = create_dissector_handle(dissect_vmlab, proto_vmlab);
 
-    dissector_add("ethertype", ETHERTYPE_VMLAB, vmlab_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_VMLAB, vmlab_handle);
 }
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 8a44c2b917..8d89d7bc8d 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -3263,10 +3263,10 @@ proto_reg_handoff_vnc(void)
 	if(!inited) {
 		vnc_handle = create_dissector_handle(dissect_vnc, proto_vnc);
 
-		dissector_add("tcp.port", 5500, vnc_handle);
-		dissector_add("tcp.port", 5501, vnc_handle);
-		dissector_add("tcp.port", 5900, vnc_handle);
-		dissector_add("tcp.port", 5901, vnc_handle);
+		dissector_add_uint("tcp.port", 5500, vnc_handle);
+		dissector_add_uint("tcp.port", 5501, vnc_handle);
+		dissector_add_uint("tcp.port", 5900, vnc_handle);
+		dissector_add_uint("tcp.port", 5901, vnc_handle);
 
 		heur_dissector_add("tcp", test_vnc_protocol, proto_vnc);
 		/* We don't register a port for the VNC HTTP server because
@@ -3282,7 +3282,7 @@ proto_reg_handoff_vnc(void)
 		   vnc_preference_alternate_port != 5900 &&
 		   vnc_preference_alternate_port != 5901) {
 			if (vnc_preference_alternate_port_last != 0) {
-				dissector_delete("tcp.port",
+				dissector_delete_uint("tcp.port",
 						 vnc_preference_alternate_port_last,
 						 vnc_handle);
 			}
@@ -3292,7 +3292,7 @@ proto_reg_handoff_vnc(void)
 
 			/* Register the new port setting */
 			if (vnc_preference_alternate_port != 0) {
-				dissector_add("tcp.port",
+				dissector_add_uint("tcp.port",
 					      vnc_preference_alternate_port,
 					      vnc_handle);
 			}
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index af9bedfd60..e54eb8bdeb 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -310,5 +310,5 @@ proto_reg_handoff_vrrp(void)
 	dissector_handle_t vrrp_handle;
 
 	vrrp_handle = create_dissector_handle(dissect_vrrp, proto_vrrp);
-	dissector_add("ip.proto", IP_PROTO_VRRP, vrrp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_VRRP, vrrp_handle);
 }
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 07cff2ecb6..36f0cdb44a 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -691,5 +691,5 @@ proto_reg_handoff_vtp(void)
 	dissector_handle_t vtp_handle;
 
 	vtp_handle = create_dissector_handle(dissect_vtp, proto_vtp);
-	dissector_add("llc.cisco_pid", 0x2003, vtp_handle);
+	dissector_add_uint("llc.cisco_pid", 0x2003, vtp_handle);
 }
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index bafc74486f..5f0f101851 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -1178,5 +1178,5 @@ proto_reg_handoff_wai(void)
 
     data_handle = find_dissector("data");
     wai_handle  = find_dissector("wai");
-    dissector_add("ethertype", ETHERTYPE_WAI, wai_handle);
+    dissector_add_uint("ethertype", ETHERTYPE_WAI, wai_handle);
 }
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index 68a8c2c07a..7a2fed9f1f 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -2118,9 +2118,9 @@ proto_reg_handoff_wassp(void)
 
 
 	wassp_handle = new_create_dissector_handle(dissect_wassp_static, proto_wassp);
-	dissector_add("udp.port", PORT_WASSP_DISCOVER, wassp_handle);
-	dissector_add("udp.port", PORT_WASSP_TUNNEL, wassp_handle);
-	/* dissector_add("udp.port", PORT_WASSP_PEER, wassp_handle); */
+	dissector_add_uint("udp.port", PORT_WASSP_DISCOVER, wassp_handle);
+	dissector_add_uint("udp.port", PORT_WASSP_TUNNEL, wassp_handle);
+	/* dissector_add_uint("udp.port", PORT_WASSP_PEER, wassp_handle); */
 #if 0
 	heur_dissector_add("udp", dissect_wassp_heur, proto_wassp);
 #endif
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index 9cae1bdfcd..9b2ca4ef51 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -1472,5 +1472,5 @@ proto_reg_handoff_wccp(void)
 	dissector_handle_t wccp_handle;
 
 	wccp_handle = new_create_dissector_handle(dissect_wccp, proto_wccp);
-	dissector_add("udp.port", UDP_PORT_WCCP, wccp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WCCP, wccp_handle);
 }
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index a20c86eccd..163d983d1d 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -707,6 +707,6 @@ proto_reg_handoff_wcp(void) {
     fr_uncompressed_handle = find_dissector("fr_uncompressed");
 
     wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp);
-    dissector_add("fr.ietf", NLPID_COMPRESSED, wcp_handle);
-    dissector_add("ethertype",  ETHERTYPE_WCP, wcp_handle);
+    dissector_add_uint("fr.ietf", NLPID_COMPRESSED, wcp_handle);
+    dissector_add_uint("ethertype",  ETHERTYPE_WCP, wcp_handle);
 }
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 76f2f44594..a94e6dfdee 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -113,7 +113,7 @@ proto_reg_handoff_wfleet_hdlc(void)
   dissector_handle_t wfleet_hdlc_handle;
 
   wfleet_hdlc_handle = find_dissector("wfleet_hdlc");
-  dissector_add("wtap_encap", WTAP_ENCAP_WFLEET_HDLC, wfleet_hdlc_handle);
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_WFLEET_HDLC, wfleet_hdlc_handle);
 
   /* 
    * Find the eth dissector and save a ref to it
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index f3be5049d1..5876351db0 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -301,5 +301,5 @@ proto_reg_handoff_who(void)
 	dissector_handle_t who_handle;
 
 	who_handle = create_dissector_handle(dissect_who, proto_who);
-	dissector_add("udp.port", UDP_PORT_WHO, who_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WHO, who_handle);
 }
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index f82f3dacef..48bd8560a2 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -890,5 +890,5 @@ proto_reg_handoff_winsrepl(void)
 	dissector_handle_t winsrepl_handle;
 
 	winsrepl_handle = create_dissector_handle(dissect_winsrepl, proto_winsrepl);
-	dissector_add("tcp.port", glb_winsrepl_tcp_port, winsrepl_handle);
+	dissector_add_uint("tcp.port", glb_winsrepl_tcp_port, winsrepl_handle);
 }
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 372eedf541..2edc791ac6 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -4120,9 +4120,9 @@ proto_reg_handoff_wlccp(void)
 
 	wlccp_handle = create_dissector_handle(dissect_wlccp, proto_wlccp);
 
-	dissector_add("ethertype", ETHERTYPE_WLCCP, wlccp_handle);
-	dissector_add("udp.port", WLCCP_UDP_PORT, wlccp_handle);
-	dissector_add("llc.wlccp_pid", 0x0000, wlccp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_WLCCP, wlccp_handle);
+	dissector_add_uint("udp.port", WLCCP_UDP_PORT, wlccp_handle);
+	dissector_add_uint("llc.wlccp_pid", 0x0000, wlccp_handle);
 
 }
 
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c
index e4481e2749..f6e7a8209c 100644
--- a/epan/dissectors/packet-wol.c
+++ b/epan/dissectors/packet-wol.c
@@ -342,8 +342,8 @@ proto_reg_handoff_wol(void)
      * Unless anyone has a better idea, just register with only those that
      * are in "common usage" and grow this list as needed.  Yeah, I'm sure
      * we'll miss some, but how else to do this ... add a thousand of
-     * these dissector_add()'s and heur_dissector_add()'s??? */
-    dissector_add("ethertype", ETHERTYPE_WOL, wol_handle);
+     * these dissector_add_uint()'s and heur_dissector_add()'s??? */
+    dissector_add_uint("ethertype", ETHERTYPE_WOL, wol_handle);
     heur_dissector_add("udp", dissect_wol, proto_wol);
 }
 
diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c
index fd4fd303c3..06cf4b1232 100644
--- a/epan/dissectors/packet-wow.c
+++ b/epan/dissectors/packet-wow.c
@@ -644,6 +644,6 @@ proto_reg_handoff_wow(void)
 	dissector_handle_t wow_handle;
 
 	wow_handle = new_create_dissector_handle(dissect_wow, proto_wow);
-	dissector_add("tcp.port", WOW_PORT, wow_handle);
+	dissector_add_uint("tcp.port", WOW_PORT, wow_handle);
 
 }
diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c
index eee775433c..aa25352fd5 100644
--- a/epan/dissectors/packet-wsmp.c
+++ b/epan/dissectors/packet-wsmp.c
@@ -203,7 +203,7 @@ proto_reg_handoff_wsmp(void)
         dissector_handle_t wsmp_handle;
 
         wsmp_handle = create_dissector_handle(dissect_wsmp, proto_wsmp);
-        dissector_add("ethertype", ETHERTYPE_WSMP, wsmp_handle);
+        dissector_add_uint("ethertype", ETHERTYPE_WSMP, wsmp_handle);
         data_handle = find_dissector("data");
         return;
 }
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index cf550e1672..c94fb1b525 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7374,16 +7374,16 @@ proto_reg_handoff_wsp(void)
 	wbxml_uaprof_handle = find_dissector("wbxml-uaprof");
 
 	/* Only connection-less WSP has no previous handler */
-	dissector_add("udp.port", UDP_PORT_WSP, wsp_fromudp_handle);
-	dissector_add("udp.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WSP, wsp_fromudp_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
 
 	/* GSM SMS UD dissector can also carry WSP */
-	dissector_add("gsm-sms-ud.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
-	dissector_add("gsm-sms-ud.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
+	dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
+	dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
 
 	/* GSM SMS dissector can also carry WSP */
-	dissector_add("gsm-sms.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
-	dissector_add("gsm-sms.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
+	dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WSP, wsp_fromudp_handle);
+	dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WSP_PUSH, wsp_fromudp_handle);
 
 	/* As the media types for WSP and HTTP are the same, the WSP dissector
 	 * uses the same string dissector table as the HTTP protocol. */
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index ec9d83f6ab..e2d8693337 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -334,7 +334,7 @@ dissect_wtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 	{
-		switch ( pinfo->match_port )
+		switch ( pinfo->match_uint )
 		{
 			case UDP_PORT_WTLS_WSP:
 				col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WSP" );
@@ -1598,7 +1598,7 @@ proto_reg_handoff_wtls(void)
 	dissector_handle_t wtls_handle;
 
 	wtls_handle = create_dissector_handle(dissect_wtls, proto_wtls);
-	dissector_add("udp.port", UDP_PORT_WTLS_WSP,     wtls_handle);
-	dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, wtls_handle);
-	dissector_add("udp.port", UDP_PORT_WTLS_WSP_PUSH,wtls_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WTLS_WSP,     wtls_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WTLS_WTP_WSP, wtls_handle);
+	dissector_add_uint("udp.port", UDP_PORT_WTLS_WSP_PUSH,wtls_handle);
 }
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 786e7032f9..477d1d3c9e 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -1100,7 +1100,7 @@ proto_reg_handoff_wtp(void)
     wsp_handle = find_dissector("wsp-co");
 
     wtp_fromudp_handle = find_dissector("wtp-udp");
-    dissector_add("udp.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
-    dissector_add("gsm-sms-ud.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
-	dissector_add("gsm-sms.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
+    dissector_add_uint("udp.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
+    dissector_add_uint("gsm-sms-ud.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
+	dissector_add_uint("gsm-sms.udh.port", UDP_PORT_WTP_WSP, wtp_fromudp_handle);
 }
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 02011927fd..1cebaa420d 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -2867,7 +2867,7 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo,
       else if (state->byte_order == BYTE_ORDER_LE)
             return TRUE;        /* known to be little-endian */
 
-      if (pinfo->srcport == pinfo->match_port) {
+      if (pinfo->srcport == pinfo->match_uint) {
             /*
              * This is a reply or event; we don't try to guess the
              * byte order on it for now.
@@ -5583,7 +5583,7 @@ dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
       col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11");
 
-      if (pinfo->match_port == pinfo->srcport)
+      if (pinfo->match_uint == pinfo->srcport)
             dissect_x11_replies(tvb, pinfo, tree);
       else
             dissect_x11_requests(tvb, pinfo, tree);
@@ -5664,8 +5664,8 @@ proto_reg_handoff_x11(void)
       dissector_handle_t x11_handle;
 
       x11_handle = create_dissector_handle(dissect_x11, proto_x11);
-      dissector_add("tcp.port", TCP_PORT_X11, x11_handle);
-      dissector_add("tcp.port", TCP_PORT_X11_2, x11_handle);
-      dissector_add("tcp.port", TCP_PORT_X11_3, x11_handle);
+      dissector_add_uint("tcp.port", TCP_PORT_X11, x11_handle);
+      dissector_add_uint("tcp.port", TCP_PORT_X11_2, x11_handle);
+      dissector_add_uint("tcp.port", TCP_PORT_X11_3, x11_handle);
 }
 
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 4272dff189..293ece4110 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -1936,7 +1936,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		     * Is there a dissector handle for this SPI?
 		     * If so, assign it to this virtual circuit.
 		     */
-		    dissect = dissector_get_port_handle(x25_subdissector_table, spi);
+		    dissect = dissector_get_uint_handle(x25_subdissector_table, spi);
 		    if (dissect != NULL)
 			x25_hash_add_proto_start(vc, pinfo->fd->num, dissect);
 		}
@@ -2735,5 +2735,5 @@ proto_reg_handoff_x25(void)
     data_handle = find_dissector("data");
 
     x25_handle = find_dissector("x.25");
-    dissector_add("llc.dsap", SAP_X25, x25_handle);
+    dissector_add_uint("llc.dsap", SAP_X25, x25_handle);
 }
diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c
index 5bfca9059d..ca9f91c929 100644
--- a/epan/dissectors/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
@@ -271,5 +271,5 @@ proto_reg_handoff_x29(void)
 	dissector_handle_t x29_handle;
 
 	x29_handle = create_dissector_handle(dissect_x29, proto_x29);
-	dissector_add("x.25.spi", NLPID_SPI_X_29, x29_handle);
+	dissector_add_uint("x.25.spi", NLPID_SPI_X_29, x29_handle);
 }
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 25f2aa87f0..337832b476 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -4581,27 +4581,27 @@ static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -5880,112 +5880,112 @@ proto_reg_handoff_x2ap(void)
 	x2ap_handle = find_dissector("x2ap");
 	if (!Initialized) {
 		dissector_add_handle("sctp.port", x2ap_handle);  /* for "decode-as" */
-		dissector_add("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
+		dissector_add_uint("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
 		Initialized=TRUE;
 
 /*--- Included file: packet-x2ap-dis-tab.c ---*/
 #line 1 "packet-x2ap-dis-tab.c"
-  dissector_add("x2ap.ies", id_E_RABs_Admitted_Item, new_create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RABs_Admitted_List, new_create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RAB_Item, new_create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RABs_NotAdmitted_List, new_create_dissector_handle(dissect_E_RAB_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RABs_ToBeSetup_Item, new_create_dissector_handle(dissect_E_RABs_ToBeSetup_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellInformation, new_create_dissector_handle(dissect_CellInformation_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellInformation_Item, new_create_dissector_handle(dissect_CellInformation_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_New_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_Old_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_TargetCell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_TargeteNBtoSource_eNBTransparentContainer, new_create_dissector_handle(dissect_TargeteNBtoSource_eNBTransparentContainer_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_TraceActivation, new_create_dissector_handle(dissect_TraceActivation_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_UE_ContextInformation, new_create_dissector_handle(dissect_UE_ContextInformation_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_UE_HistoryInformation, new_create_dissector_handle(dissect_UE_HistoryInformation_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ServedCells, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_GlobalENB_ID, new_create_dissector_handle(dissect_GlobalENB_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_GUMMEI_ID, new_create_dissector_handle(dissect_GUMMEI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_GUGroupIDList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ServedCellsToAdd, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ServedCellsToModify, new_create_dissector_handle(dissect_ServedCellsToModify_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ServedCellsToDelete, new_create_dissector_handle(dissect_Old_ECGIs_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_Registration_Request, new_create_dissector_handle(dissect_Registration_Request_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellToReport, new_create_dissector_handle(dissect_CellToReport_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriodicity_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellToReport_Item, new_create_dissector_handle(dissect_CellToReport_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellMeasurementResult, new_create_dissector_handle(dissect_CellMeasurementResult_List_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_CellMeasurementResult_Item, new_create_dissector_handle(dissect_CellMeasurementResult_Item_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_GUGroupIDToAddList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_GUGroupIDToDeleteList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB1_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB2_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB1_Cell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB2_Cell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB2_Proposed_Mobility_Parameters, new_create_dissector_handle(dissect_MobilityParametersInformation_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB1_Mobility_Parameters, new_create_dissector_handle(dissect_MobilityParametersInformation_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ENB2_Mobility_Parameters_Modification_Range, new_create_dissector_handle(dissect_MobilityParametersModificationRange_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_FailureCellPCI, new_create_dissector_handle(dissect_PCI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_Re_establishmentCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_FailureCellCRNTI, new_create_dissector_handle(dissect_CRNTI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ShortMAC_I, new_create_dissector_handle(dissect_ShortMAC_I_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_SourceCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_FailureCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_HandoverReportType, new_create_dissector_handle(dissect_HandoverReportType_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_UE_RLF_Report_Container, new_create_dissector_handle(dissect_UE_RLF_Report_Container_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ServedCellsToActivate, new_create_dissector_handle(dissect_ServedCellsToActivate_PDU, proto_x2ap));
-  dissector_add("x2ap.ies", id_ActivatedCellList, new_create_dissector_handle(dissect_ActivatedCellList_PDU, proto_x2ap));
-  dissector_add("x2ap.extension", id_Number_of_Antennaports, new_create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap));
-  dissector_add("x2ap.extension", id_CompositeAvailableCapacityGroup, new_create_dissector_handle(dissect_CompositeAvailableCapacityGroup_PDU, proto_x2ap));
-  dissector_add("x2ap.extension", id_PRACH_Configuration, new_create_dissector_handle(dissect_PRACH_Configuration_PDU, proto_x2ap));
-  dissector_add("x2ap.extension", id_MBSFN_Subframe_Info, new_create_dissector_handle(dissect_MBSFN_Subframe_Infolist_PDU, proto_x2ap));
-  dissector_add("x2ap.extension", id_DeactivationIndication, new_create_dissector_handle(dissect_DeactivationIndication_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_snStatusTransfer, new_create_dissector_handle(dissect_SNStatusTransfer_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_uEContextRelease, new_create_dissector_handle(dissect_UEContextRelease_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_handoverCancel, new_create_dissector_handle(dissect_HandoverCancel_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_errorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_reset, new_create_dissector_handle(dissect_ResetRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_reset, new_create_dissector_handle(dissect_ResetResponse_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_x2Setup, new_create_dissector_handle(dissect_X2SetupRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_x2Setup, new_create_dissector_handle(dissect_X2SetupResponse_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_x2Setup, new_create_dissector_handle(dissect_X2SetupFailure_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_loadIndication, new_create_dissector_handle(dissect_LoadInformation_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_resourceStatusReporting, new_create_dissector_handle(dissect_ResourceStatusUpdate_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_handoverReport, new_create_dissector_handle(dissect_HandoverReport_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_rLFIndication, new_create_dissector_handle(dissect_RLFIndication_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeAcknowledge_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeFailure_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.imsg", id_cellActivation, new_create_dissector_handle(dissect_CellActivationRequest_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.sout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationResponse_PDU, proto_x2ap));
-  dissector_add("x2ap.proc.uout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_Item, new_create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_List, new_create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RAB_Item, new_create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_NotAdmitted_List, new_create_dissector_handle(dissect_E_RAB_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_ToBeSetup_Item, new_create_dissector_handle(dissect_E_RABs_ToBeSetup_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellInformation, new_create_dissector_handle(dissect_CellInformation_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellInformation_Item, new_create_dissector_handle(dissect_CellInformation_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_New_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_Old_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_TargetCell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_TargeteNBtoSource_eNBTransparentContainer, new_create_dissector_handle(dissect_TargeteNBtoSource_eNBTransparentContainer_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_TraceActivation, new_create_dissector_handle(dissect_TraceActivation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_UE_ContextInformation, new_create_dissector_handle(dissect_UE_ContextInformation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_UE_HistoryInformation, new_create_dissector_handle(dissect_UE_HistoryInformation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ServedCells, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_GlobalENB_ID, new_create_dissector_handle(dissect_GlobalENB_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_GUMMEI_ID, new_create_dissector_handle(dissect_GUMMEI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_GUGroupIDList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ServedCellsToAdd, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ServedCellsToModify, new_create_dissector_handle(dissect_ServedCellsToModify_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ServedCellsToDelete, new_create_dissector_handle(dissect_Old_ECGIs_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_Registration_Request, new_create_dissector_handle(dissect_Registration_Request_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellToReport, new_create_dissector_handle(dissect_CellToReport_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriodicity_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellToReport_Item, new_create_dissector_handle(dissect_CellToReport_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellMeasurementResult, new_create_dissector_handle(dissect_CellMeasurementResult_List_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_CellMeasurementResult_Item, new_create_dissector_handle(dissect_CellMeasurementResult_Item_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_GUGroupIDToAddList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_GUGroupIDToDeleteList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB1_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB2_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB1_Cell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB2_Cell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB2_Proposed_Mobility_Parameters, new_create_dissector_handle(dissect_MobilityParametersInformation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB1_Mobility_Parameters, new_create_dissector_handle(dissect_MobilityParametersInformation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ENB2_Mobility_Parameters_Modification_Range, new_create_dissector_handle(dissect_MobilityParametersModificationRange_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_FailureCellPCI, new_create_dissector_handle(dissect_PCI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_Re_establishmentCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_FailureCellCRNTI, new_create_dissector_handle(dissect_CRNTI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ShortMAC_I, new_create_dissector_handle(dissect_ShortMAC_I_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_SourceCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_FailureCellECGI, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_HandoverReportType, new_create_dissector_handle(dissect_HandoverReportType_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_UE_RLF_Report_Container, new_create_dissector_handle(dissect_UE_RLF_Report_Container_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ServedCellsToActivate, new_create_dissector_handle(dissect_ServedCellsToActivate_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.ies", id_ActivatedCellList, new_create_dissector_handle(dissect_ActivatedCellList_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_Number_of_Antennaports, new_create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_CompositeAvailableCapacityGroup, new_create_dissector_handle(dissect_CompositeAvailableCapacityGroup_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_PRACH_Configuration, new_create_dissector_handle(dissect_PRACH_Configuration_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_MBSFN_Subframe_Info, new_create_dissector_handle(dissect_MBSFN_Subframe_Infolist_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.extension", id_DeactivationIndication, new_create_dissector_handle(dissect_DeactivationIndication_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_handoverPreparation, new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_snStatusTransfer, new_create_dissector_handle(dissect_SNStatusTransfer_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_uEContextRelease, new_create_dissector_handle(dissect_UEContextRelease_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_handoverCancel, new_create_dissector_handle(dissect_HandoverCancel_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_errorIndication, new_create_dissector_handle(dissect_ErrorIndication_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_reset, new_create_dissector_handle(dissect_ResetRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_reset, new_create_dissector_handle(dissect_ResetResponse_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_x2Setup, new_create_dissector_handle(dissect_X2SetupRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_x2Setup, new_create_dissector_handle(dissect_X2SetupResponse_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_x2Setup, new_create_dissector_handle(dissect_X2SetupFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_loadIndication, new_create_dissector_handle(dissect_LoadInformation_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_eNBConfigurationUpdate, new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_resourceStatusReportingInitiation, new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_resourceStatusReporting, new_create_dissector_handle(dissect_ResourceStatusUpdate_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_privateMessage, new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_handoverReport, new_create_dissector_handle(dissect_HandoverReport_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_rLFIndication, new_create_dissector_handle(dissect_RLFIndication_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeAcknowledge_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_mobilitySettingsChange, new_create_dissector_handle(dissect_MobilityChangeFailure_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.imsg", id_cellActivation, new_create_dissector_handle(dissect_CellActivationRequest_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.sout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationResponse_PDU, proto_x2ap));
+  dissector_add_uint("x2ap.proc.uout", id_cellActivation, new_create_dissector_handle(dissect_CellActivationFailure_PDU, proto_x2ap));
 
 
 /*--- End of included file: packet-x2ap-dis-tab.c ---*/
 #line 203 "packet-x2ap-template.c"
 	} else {
 		if (SctpPort != 0) {
-			dissector_delete("sctp.port", SctpPort, x2ap_handle);
+			dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);
 		}
 	}
 
 	SctpPort=gbl_x2apSctpPort;
 	if (SctpPort != 0) {
-		dissector_add("sctp.port", SctpPort, x2ap_handle);
+		dissector_add_uint("sctp.port", SctpPort, x2ap_handle);
 	}
 
 }
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index fda780794b..6a3042066e 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -2212,7 +2212,7 @@ dissect_x411_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tv
 #line 575 "x411.cnf"
 
 	proto_item_append_text(tree, " (%s)", val_to_str(extension_id, x411_ExtensionAttributeType_vals, "extension-attribute-type %d")); 
-	if (dissector_try_port(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+	if (dissector_try_uint(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 		offset =tvb_length(tvb);
 	} else {
 		proto_item *item = NULL;
@@ -3032,7 +3032,7 @@ dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 	if(extension_id != -1) {
 		proto_item_append_text(tree, " (%s)", val_to_str(extension_id, x411_StandardExtension_vals, "standard-extension %d")); 
-  		if (dissector_try_port(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+  		if (dissector_try_uint(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 			offset = tvb_length(tvb);
 		} else {
 			proto_item *item = NULL;
@@ -7195,7 +7195,7 @@ dissect_x411_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 #line 1235 "x411.cnf"
 
 	proto_item_append_text(tree, " (%s)", val_to_str(extension_id, x411_TokenDataType_vals, "tokendata-type %d")); 
-	if (dissector_try_port(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+	if (dissector_try_uint(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
 		offset = tvb_length(tvb);
 	} else {
 		proto_item *item = NULL;
@@ -10906,92 +10906,92 @@ void proto_reg_handoff_x411(void) {
 
 /*--- Included file: packet-x411-dis-tab.c ---*/
 #line 1 "packet-x411-dis-tab.c"
-  dissector_add("x411.extension", 1, create_dissector_handle(dissect_RecipientReassignmentProhibited_PDU, proto_x411));
-  dissector_add("x411.extension", 2, create_dissector_handle(dissect_OriginatorRequestedAlternateRecipient_PDU, proto_x411));
-  dissector_add("x411.extension", 3, create_dissector_handle(dissect_DLExpansionProhibited_PDU, proto_x411));
-  dissector_add("x411.extension", 4, create_dissector_handle(dissect_ConversionWithLossProhibited_PDU, proto_x411));
-  dissector_add("x411.extension", 5, create_dissector_handle(dissect_LatestDeliveryTime_PDU, proto_x411));
-  dissector_add("x411.extension", 6, create_dissector_handle(dissect_RequestedDeliveryMethod_PDU, proto_x411));
-  dissector_add("x411.extension", 7, create_dissector_handle(dissect_PhysicalForwardingProhibited_PDU, proto_x411));
-  dissector_add("x411.extension", 8, create_dissector_handle(dissect_PhysicalForwardingAddressRequest_PDU, proto_x411));
-  dissector_add("x411.extension", 9, create_dissector_handle(dissect_PhysicalDeliveryModes_PDU, proto_x411));
-  dissector_add("x411.extension", 10, create_dissector_handle(dissect_RegisteredMailType_PDU, proto_x411));
-  dissector_add("x411.extension", 11, create_dissector_handle(dissect_RecipientNumberForAdvice_PDU, proto_x411));
-  dissector_add("x411.extension", 12, create_dissector_handle(dissect_PhysicalRenditionAttributes_PDU, proto_x411));
-  dissector_add("x411.extension", 13, create_dissector_handle(dissect_OriginatorReturnAddress_PDU, proto_x411));
-  dissector_add("x411.extension", 14, create_dissector_handle(dissect_PhysicalDeliveryReportRequest_PDU, proto_x411));
-  dissector_add("x411.extension", 15, create_dissector_handle(dissect_OriginatorCertificate_PDU, proto_x411));
-  dissector_add("x411.extension", 16, create_dissector_handle(dissect_MessageToken_PDU, proto_x411));
-  dissector_add("x411.extension", 17, create_dissector_handle(dissect_ContentConfidentialityAlgorithmIdentifier_PDU, proto_x411));
-  dissector_add("x411.extension", 18, create_dissector_handle(dissect_ContentIntegrityCheck_PDU, proto_x411));
-  dissector_add("x411.extension", 19, create_dissector_handle(dissect_MessageOriginAuthenticationCheck_PDU, proto_x411));
-  dissector_add("x411.extension", 20, create_dissector_handle(dissect_MessageSecurityLabel_PDU, proto_x411));
-  dissector_add("x411.extension", 21, create_dissector_handle(dissect_ProofOfSubmissionRequest_PDU, proto_x411));
-  dissector_add("x411.extension", 22, create_dissector_handle(dissect_ProofOfDeliveryRequest_PDU, proto_x411));
-  dissector_add("x411.extension", 23, create_dissector_handle(dissect_ContentCorrelator_PDU, proto_x411));
-  dissector_add("x411.extension", 24, create_dissector_handle(dissect_ProbeOriginAuthenticationCheck_PDU, proto_x411));
-  dissector_add("x411.extension", 25, create_dissector_handle(dissect_RedirectionHistory_PDU, proto_x411));
-  dissector_add("x411.extension", 26, create_dissector_handle(dissect_DLExpansionHistory_PDU, proto_x411));
-  dissector_add("x411.extension", 27, create_dissector_handle(dissect_PhysicalForwardingAddress_PDU, proto_x411));
-  dissector_add("x411.extension", 28, create_dissector_handle(dissect_RecipientCertificate_PDU, proto_x411));
-  dissector_add("x411.extension", 29, create_dissector_handle(dissect_ProofOfDelivery_PDU, proto_x411));
-  dissector_add("x411.extension", 30, create_dissector_handle(dissect_OriginatorAndDLExpansionHistory_PDU, proto_x411));
-  dissector_add("x411.extension", 31, create_dissector_handle(dissect_ReportingDLName_PDU, proto_x411));
-  dissector_add("x411.extension", 32, create_dissector_handle(dissect_ReportingMTACertificate_PDU, proto_x411));
-  dissector_add("x411.extension", 33, create_dissector_handle(dissect_ReportOriginAuthenticationCheck_PDU, proto_x411));
-  dissector_add("x411.extension", 35, create_dissector_handle(dissect_ProofOfSubmission_PDU, proto_x411));
-  dissector_add("x411.extension", 37, create_dissector_handle(dissect_TraceInformation_PDU, proto_x411));
-  dissector_add("x411.extension", 38, create_dissector_handle(dissect_InternalTraceInformation_PDU, proto_x411));
-  dissector_add("x411.extension", 39, create_dissector_handle(dissect_ReportingMTAName_PDU, proto_x411));
-  dissector_add("x411.extension", 40, create_dissector_handle(dissect_ExtendedCertificates_PDU, proto_x411));
-  dissector_add("x411.extension", 42, create_dissector_handle(dissect_DLExemptedRecipients_PDU, proto_x411));
-  dissector_add("x411.extension", 45, create_dissector_handle(dissect_CertificateSelectors_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 1, create_dissector_handle(dissect_CommonName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 2, create_dissector_handle(dissect_TeletexCommonName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 3, create_dissector_handle(dissect_TeletexOrganizationName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 4, create_dissector_handle(dissect_TeletexPersonalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 5, create_dissector_handle(dissect_TeletexOrganizationalUnitNames_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 6, create_dissector_handle(dissect_TeletexDomainDefinedAttributes_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 7, create_dissector_handle(dissect_PDSName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 8, create_dissector_handle(dissect_PhysicalDeliveryCountryName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 9, create_dissector_handle(dissect_PostalCode_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 10, create_dissector_handle(dissect_PhysicalDeliveryOfficeName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 11, create_dissector_handle(dissect_PhysicalDeliveryOfficeNumber_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 12, create_dissector_handle(dissect_ExtensionORAddressComponents_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 13, create_dissector_handle(dissect_PhysicalDeliveryPersonalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 14, create_dissector_handle(dissect_PhysicalDeliveryOrganizationName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 15, create_dissector_handle(dissect_ExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 16, create_dissector_handle(dissect_UnformattedPostalAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 17, create_dissector_handle(dissect_StreetAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 18, create_dissector_handle(dissect_PostOfficeBoxAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 19, create_dissector_handle(dissect_PosteRestanteAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 20, create_dissector_handle(dissect_UniquePostalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 21, create_dissector_handle(dissect_LocalPostalAttributes_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 22, create_dissector_handle(dissect_ExtendedNetworkAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 23, create_dissector_handle(dissect_TerminalType_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 24, create_dissector_handle(dissect_UniversalCommonName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 25, create_dissector_handle(dissect_UniversalOrganizationName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 26, create_dissector_handle(dissect_UniversalPersonalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 27, create_dissector_handle(dissect_UniversalOrganizationalUnitNames_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 28, create_dissector_handle(dissect_UniversalDomainDefinedAttributes_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 29, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 30, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeNumber_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 31, create_dissector_handle(dissect_UniversalExtensionORAddressComponents_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 32, create_dissector_handle(dissect_UniversalPhysicalDeliveryPersonalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 33, create_dissector_handle(dissect_UniversalPhysicalDeliveryOrganizationName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 34, create_dissector_handle(dissect_UniversalExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 35, create_dissector_handle(dissect_UniversalUnformattedPostalAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 36, create_dissector_handle(dissect_UniversalStreetAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 37, create_dissector_handle(dissect_UniversalPostOfficeBoxAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 38, create_dissector_handle(dissect_UniversalPosteRestanteAddress_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 39, create_dissector_handle(dissect_UniversalUniquePostalName_PDU, proto_x411));
-  dissector_add("x411.extension-attribute", 40, create_dissector_handle(dissect_UniversalLocalPostalAttributes_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 1, create_dissector_handle(dissect_RecipientReassignmentProhibited_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 2, create_dissector_handle(dissect_OriginatorRequestedAlternateRecipient_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 3, create_dissector_handle(dissect_DLExpansionProhibited_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 4, create_dissector_handle(dissect_ConversionWithLossProhibited_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 5, create_dissector_handle(dissect_LatestDeliveryTime_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 6, create_dissector_handle(dissect_RequestedDeliveryMethod_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 7, create_dissector_handle(dissect_PhysicalForwardingProhibited_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 8, create_dissector_handle(dissect_PhysicalForwardingAddressRequest_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 9, create_dissector_handle(dissect_PhysicalDeliveryModes_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 10, create_dissector_handle(dissect_RegisteredMailType_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 11, create_dissector_handle(dissect_RecipientNumberForAdvice_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 12, create_dissector_handle(dissect_PhysicalRenditionAttributes_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 13, create_dissector_handle(dissect_OriginatorReturnAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 14, create_dissector_handle(dissect_PhysicalDeliveryReportRequest_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 15, create_dissector_handle(dissect_OriginatorCertificate_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 16, create_dissector_handle(dissect_MessageToken_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 17, create_dissector_handle(dissect_ContentConfidentialityAlgorithmIdentifier_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 18, create_dissector_handle(dissect_ContentIntegrityCheck_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 19, create_dissector_handle(dissect_MessageOriginAuthenticationCheck_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 20, create_dissector_handle(dissect_MessageSecurityLabel_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 21, create_dissector_handle(dissect_ProofOfSubmissionRequest_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 22, create_dissector_handle(dissect_ProofOfDeliveryRequest_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 23, create_dissector_handle(dissect_ContentCorrelator_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 24, create_dissector_handle(dissect_ProbeOriginAuthenticationCheck_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 25, create_dissector_handle(dissect_RedirectionHistory_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 26, create_dissector_handle(dissect_DLExpansionHistory_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 27, create_dissector_handle(dissect_PhysicalForwardingAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 28, create_dissector_handle(dissect_RecipientCertificate_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 29, create_dissector_handle(dissect_ProofOfDelivery_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 30, create_dissector_handle(dissect_OriginatorAndDLExpansionHistory_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 31, create_dissector_handle(dissect_ReportingDLName_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 32, create_dissector_handle(dissect_ReportingMTACertificate_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 33, create_dissector_handle(dissect_ReportOriginAuthenticationCheck_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 35, create_dissector_handle(dissect_ProofOfSubmission_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 37, create_dissector_handle(dissect_TraceInformation_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 38, create_dissector_handle(dissect_InternalTraceInformation_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 39, create_dissector_handle(dissect_ReportingMTAName_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 40, create_dissector_handle(dissect_ExtendedCertificates_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 42, create_dissector_handle(dissect_DLExemptedRecipients_PDU, proto_x411));
+  dissector_add_uint("x411.extension", 45, create_dissector_handle(dissect_CertificateSelectors_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 1, create_dissector_handle(dissect_CommonName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 2, create_dissector_handle(dissect_TeletexCommonName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 3, create_dissector_handle(dissect_TeletexOrganizationName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 4, create_dissector_handle(dissect_TeletexPersonalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 5, create_dissector_handle(dissect_TeletexOrganizationalUnitNames_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 6, create_dissector_handle(dissect_TeletexDomainDefinedAttributes_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 7, create_dissector_handle(dissect_PDSName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 8, create_dissector_handle(dissect_PhysicalDeliveryCountryName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 9, create_dissector_handle(dissect_PostalCode_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 10, create_dissector_handle(dissect_PhysicalDeliveryOfficeName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 11, create_dissector_handle(dissect_PhysicalDeliveryOfficeNumber_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 12, create_dissector_handle(dissect_ExtensionORAddressComponents_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 13, create_dissector_handle(dissect_PhysicalDeliveryPersonalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 14, create_dissector_handle(dissect_PhysicalDeliveryOrganizationName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 15, create_dissector_handle(dissect_ExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 16, create_dissector_handle(dissect_UnformattedPostalAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 17, create_dissector_handle(dissect_StreetAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 18, create_dissector_handle(dissect_PostOfficeBoxAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 19, create_dissector_handle(dissect_PosteRestanteAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 20, create_dissector_handle(dissect_UniquePostalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 21, create_dissector_handle(dissect_LocalPostalAttributes_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 22, create_dissector_handle(dissect_ExtendedNetworkAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 23, create_dissector_handle(dissect_TerminalType_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 24, create_dissector_handle(dissect_UniversalCommonName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 25, create_dissector_handle(dissect_UniversalOrganizationName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 26, create_dissector_handle(dissect_UniversalPersonalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 27, create_dissector_handle(dissect_UniversalOrganizationalUnitNames_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 28, create_dissector_handle(dissect_UniversalDomainDefinedAttributes_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 29, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 30, create_dissector_handle(dissect_UniversalPhysicalDeliveryOfficeNumber_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 31, create_dissector_handle(dissect_UniversalExtensionORAddressComponents_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 32, create_dissector_handle(dissect_UniversalPhysicalDeliveryPersonalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 33, create_dissector_handle(dissect_UniversalPhysicalDeliveryOrganizationName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 34, create_dissector_handle(dissect_UniversalExtensionPhysicalDeliveryAddressComponents_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 35, create_dissector_handle(dissect_UniversalUnformattedPostalAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 36, create_dissector_handle(dissect_UniversalStreetAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 37, create_dissector_handle(dissect_UniversalPostOfficeBoxAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 38, create_dissector_handle(dissect_UniversalPosteRestanteAddress_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 39, create_dissector_handle(dissect_UniversalUniquePostalName_PDU, proto_x411));
+  dissector_add_uint("x411.extension-attribute", 40, create_dissector_handle(dissect_UniversalLocalPostalAttributes_PDU, proto_x411));
   register_ber_oid_dissector("2.6.3.6.0", dissect_AsymmetricToken_PDU, proto_x411, "id-tok-asymmetricToken");
   register_ber_oid_dissector("2.6.5.6.0", dissect_MTANameAndOptionalGDI_PDU, proto_x411, "id-on-mtaName");
-  dissector_add("x411.tokendata", 1, create_dissector_handle(dissect_BindTokenSignedData_PDU, proto_x411));
-  dissector_add("x411.tokendata", 2, create_dissector_handle(dissect_MessageTokenSignedData_PDU, proto_x411));
-  dissector_add("x411.tokendata", 3, create_dissector_handle(dissect_MessageTokenEncryptedData_PDU, proto_x411));
-  dissector_add("x411.tokendata", 4, create_dissector_handle(dissect_BindTokenEncryptedData_PDU, proto_x411));
+  dissector_add_uint("x411.tokendata", 1, create_dissector_handle(dissect_BindTokenSignedData_PDU, proto_x411));
+  dissector_add_uint("x411.tokendata", 2, create_dissector_handle(dissect_MessageTokenSignedData_PDU, proto_x411));
+  dissector_add_uint("x411.tokendata", 3, create_dissector_handle(dissect_MessageTokenEncryptedData_PDU, proto_x411));
+  dissector_add_uint("x411.tokendata", 4, create_dissector_handle(dissect_BindTokenEncryptedData_PDU, proto_x411));
   register_ber_oid_dissector("2.6.5.2.0", dissect_ContentLength_PDU, proto_x411, "id-at-mhs-maximum-content-length");
   register_ber_oid_dissector("2.6.5.2.1", dissect_ExtendedContentType_PDU, proto_x411, "id-at-mhs-deliverable-content-types");
   register_ber_oid_dissector("2.6.5.2.2", dissect_ExtendedEncodedInformationType_PDU, proto_x411, "id-at-mhs-exclusively-acceptable-eits");
@@ -11107,12 +11107,12 @@ prefs_register_x411(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_x411_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 1fc0e00251..49a796b542 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-x509ce.c                                                            */
-/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
+/* ../../tools/asn2wrs.py -b -e -p x509ce -c ./x509ce.cnf -s ./packet-x509ce-template -D . CertificateExtensions.asn */
 
 /* Input file: packet-x509ce-template.c */
 
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index a297a4b16c..d751041a85 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -549,5 +549,5 @@ proto_reg_handoff_xdmcp(void)
   dissector_handle_t xdmcp_handle;
 
   xdmcp_handle = create_dissector_handle(dissect_xdmcp, proto_xdmcp);
-  dissector_add("udp.port", UDP_PORT_XDMCP, xdmcp_handle);
+  dissector_add_uint("udp.port", UDP_PORT_XDMCP, xdmcp_handle);
 }
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index fee534bfda..f49605d949 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -1293,11 +1293,11 @@ static void init_xml_names(void) {
 }
 
 static void range_delete_xml_tcp_callback(guint32 port) {
-	dissector_delete("tcp.port", port, xml_handle);
+	dissector_delete_uint("tcp.port", port, xml_handle);
 }
 
 static void range_add_xml_tcp_callback(guint32 port) {
-	dissector_add("tcp.port", port, xml_handle);
+	dissector_add_uint("tcp.port", port, xml_handle);
 }
 
 static void apply_prefs(void) {
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index df92715fbd..812945de4a 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -451,7 +451,7 @@ proto_reg_handoff_xot(void)
   dissector_handle_t xot_handle;
 
   xot_handle = find_dissector("xot");
-  dissector_add("tcp.port", TCP_PORT_XOT, xot_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_XOT, xot_handle);
 
   x25_handle = find_dissector("x.25");
 }
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index 3dbcc1e1fa..7f49be0e58 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -1312,5 +1312,5 @@ proto_reg_handoff_xtp(void)
 	dissector_handle_t xtp_handle;
 
 	xtp_handle = new_create_dissector_handle(dissect_xtp, proto_xtp);
-	dissector_add("ip.proto", IP_PROTO_XTP, xtp_handle);
+	dissector_add_uint("ip.proto", IP_PROTO_XTP, xtp_handle);
 }
diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c
index bd344c68bd..20d26e4dd8 100644
--- a/epan/dissectors/packet-xyplex.c
+++ b/epan/dissectors/packet-xyplex.c
@@ -208,6 +208,6 @@ void
 proto_reg_handoff_xyplex(void)
 {
   xyplex_handle = create_dissector_handle(dissect_xyplex, proto_xyplex);
-  dissector_add("udp.port", UDP_PORT_XYPLEX, xyplex_handle);
+  dissector_add_uint("udp.port", UDP_PORT_XYPLEX, xyplex_handle);
 }
 
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index 33c70df919..b0a4c8798e 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -747,7 +747,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* Get and display the profile ID. */
     packet.profile = tvb_get_letohs(tvb, offset);
-    profile_handle = dissector_get_port_handle(zbee_aps_dissector_table, packet.profile);
+    profile_handle = dissector_get_uint_handle(zbee_aps_dissector_table, packet.profile);
     if (tree) {
         ti = proto_tree_add_uint(aps_tree, hf_zbee_aps_profile, tvb, offset,2,
                 packet.profile);
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index ab10433e29..2544549d4a 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -2179,14 +2179,14 @@ void proto_reg_handoff_zbee_zcl(void)
 
     /* Register our dissector for the appropriate profiles. */
     zbee_zcl_handle = find_dissector("zbee.zcl");
-    dissector_add("zbee.profile", ZBEE_PROFILE_IPM,   zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_T1,    zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_HA,    zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_CBA,   zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_WSN,   zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_TA,    zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_HC,    zbee_zcl_handle);
-    dissector_add("zbee.profile", ZBEE_PROFILE_SE,    zbee_zcl_handle);
-
-    dissector_add("zbee.profile", ZBEE_PROFILE_C4_CL, zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_IPM,   zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_T1,    zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_HA,    zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_CBA,   zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_WSN,   zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_TA,    zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_HC,    zbee_zcl_handle);
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_SE,    zbee_zcl_handle);
+
+    dissector_add_uint("zbee.profile", ZBEE_PROFILE_C4_CL, zbee_zcl_handle);
 } /* proto_reg_handoff_zbee_zcl */
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index 164603178b..2d75cb8c70 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -1785,5 +1785,5 @@ void proto_reg_handoff_zbee_zdp(void)
 
     /* Register our dissector with the ZigBee application dissectors. */
     zdp_handle = find_dissector("zbee.zdp");
-    dissector_add("zbee.profile", ZBEE_ZDP_PROFILE, zdp_handle);
+    dissector_add_uint("zbee.profile", ZBEE_ZDP_PROFILE, zdp_handle);
 } /* proto_reg_handoff_zbee_zdp */
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index 26f0fe9202..6aa91707d8 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -439,7 +439,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZEBRA");
 
-	request = (pinfo->destport == pinfo->match_port);
+	request = (pinfo->destport == pinfo->match_uint);
 	left = tvb_reported_length(tvb);
 	offset = 0;
 
@@ -613,5 +613,5 @@ proto_reg_handoff_zebra(void)
   dissector_handle_t zebra_handle;
 
   zebra_handle = create_dissector_handle(dissect_zebra, proto_zebra);
-  dissector_add("tcp.port", TCP_PORT_ZEBRA, zebra_handle);
+  dissector_add_uint("tcp.port", TCP_PORT_ZEBRA, zebra_handle);
 }
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 903445d505..8bfe9ae6a3 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -382,11 +382,11 @@ void proto_reg_handoff_zep(void)
     } else {
         /* If we were already registered, de-register our dissector
          * to free the port. */
-        dissector_delete("udp.port", lastPort, zep_handle);
+        dissector_delete_uint("udp.port", lastPort, zep_handle);
     }
 
     /* Register our dissector. */
-    dissector_add("udp.port", gPREF_zep_udp_port, zep_handle);
+    dissector_add_uint("udp.port", gPREF_zep_udp_port, zep_handle);
     lastPort = gPREF_zep_udp_port;
 } /* proto_reg_handoff_zep */
 
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index ec7e3f120f..5d7a33ca61 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -313,28 +313,28 @@ dissect_rpc_uint64
 dissect_tpkt_encap
 dissect_unknown_ber
 dissect_xdlc_control
-dissector_add
 dissector_add_handle
 dissector_add_string
+dissector_add_uint
 dissector_all_tables_foreach_changed
 dissector_all_tables_foreach_table
-dissector_change
 dissector_change_string
-dissector_delete
+dissector_change_uint
 dissector_delete_string
+dissector_delete_uint
 dissector_dump_decodes
 dissector_filter_list           DATA
-dissector_get_port_handle
 dissector_get_string_handle
+dissector_get_uint_handle
 dissector_handle_get_protocol_index
 dissector_handle_get_short_name
-dissector_reset
 dissector_reset_string
+dissector_reset_uint
 dissector_table_foreach
 dissector_table_foreach_handle
 dissector_try_heuristic
-dissector_try_port
 dissector_try_string
+dissector_try_uint
 draw_tap_listeners
 dscp_vals                                               DATA
 dtbl_entry_get_handle
diff --git a/epan/next_tvb.c b/epan/next_tvb.c
index e35c47ff73..2f51c5022a 100644
--- a/epan/next_tvb.c
+++ b/epan/next_tvb.c
@@ -60,14 +60,14 @@ void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree,
   list->count++;
 }
 
-void next_tvb_add_port(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 port) {
+void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 uint_val) {
   next_tvb_item_t *item;
 
   item = ep_alloc(sizeof(next_tvb_item_t));
 
-  item->type = NTVB_PORT;
+  item->type = NTVB_UINT;
   item->table = table;
-  item->port = port;
+  item->uint_val = uint_val;
   item->tvb = tvb;
   item->tree = tree;
 
@@ -114,8 +114,8 @@ void next_tvb_call(next_tvb_list_t *list, packet_info *pinfo, proto_tree *tree,
         case NTVB_HANDLE:
           call_dissector((item->handle) ? item->handle : ((handle) ? handle : data_handle), item->tvb, pinfo, (item->tree) ? item->tree : tree);
           break;
-        case NTVB_PORT:
-          dissector_try_port(item->table, item->port, item->tvb, pinfo, (item->tree) ? item->tree : tree);
+        case NTVB_UINT:
+          dissector_try_uint(item->table, item->uint_val, item->tvb, pinfo, (item->tree) ? item->tree : tree);
           break;
         case NTVB_STRING:
           dissector_try_string(item->table, item->string, item->tvb, pinfo, (item->tree) ? item->tree : tree);
diff --git a/epan/next_tvb.h b/epan/next_tvb.h
index cdb9417f6e..e3b03e74a5 100644
--- a/epan/next_tvb.h
+++ b/epan/next_tvb.h
@@ -34,7 +34,7 @@
 
 typedef enum {
   NTVB_HANDLE,
-  NTVB_PORT,
+  NTVB_UINT,
   NTVB_STRING
 } next_tvb_call_e;
 
@@ -44,7 +44,7 @@ typedef struct next_tvb_item {
   next_tvb_call_e type;
   dissector_handle_t handle;
   dissector_table_t table;
-  guint32 port;
+  guint32 uint_val;
   const gchar *string;
   tvbuff_t *tvb;
   proto_tree *tree;
@@ -58,7 +58,7 @@ typedef struct {
 
 extern void next_tvb_init(next_tvb_list_t *list);
 extern void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_handle_t handle);
-extern void next_tvb_add_port(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 port);
+extern void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 uint_val);
 extern void next_tvb_add_string(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, const gchar *string);
 extern void next_tvb_call(next_tvb_list_t *list, packet_info *pinfo, proto_tree *tree, dissector_handle_t handle, dissector_handle_t data_handle);
 
diff --git a/epan/packet.c b/epan/packet.c
index cd89256975..94a13e5054 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -623,19 +623,21 @@ struct dtbl_entry {
  *
  * "hash_table" is a hash table, indexed by port number, supplying
  * a "struct dtbl_entry"; it records what dissector is assigned to
- * that port number in that table.
+ * that uint or string value in that table.
  *
  * "dissector_handles" is a list of all dissectors that *could* be
  * used in that table; not all of them are necessarily in the table,
- * as they may be for protocols that don't have a fixed port number.
+ * as they may be for protocols that don't have a fixed uint value,
+ * e.g. for TCP or UDP port number tables and protocols with no fixed
+ * port number.
  *
  * "ui_name" is the name the dissector table has in the user interface.
  *
- * "type" is a field type giving the width of the port number for that
- * dissector table.
+ * "type" is a field type giving the width of the uint value for that
+ * dissector table, if it's a uint dissector table.
  *
- * "base" is the base in which to display the port number for that
- * dissector table.
+ * "base" is the base in which to display the uint value for that
+ * dissector table, if it's a uint dissector table.
  */
 struct dissector_table {
 	GHashTable	*hash_table;
@@ -666,13 +668,13 @@ find_uint_dtbl_entry(dissector_table_t sub_dissectors, const guint32 pattern)
 	case FT_UINT24:
 	case FT_UINT32:
 		/*
-		 * You can do a port lookup in these tables.
+		 * You can do a uint lookup in these tables.
 		 */
 		break;
 
 	default:
 		/*
-		 * But you can't do a port lookup in any other types
+		 * But you can't do a uint lookup in any other types
 		 * of tables.
 		 */
 		g_assert_not_reached();
@@ -687,7 +689,7 @@ find_uint_dtbl_entry(dissector_table_t sub_dissectors, const guint32 pattern)
 
 #if 0
 static void
-dissector_add_sanity_check(const char *name, guint32 pattern, dissector_handle_t handle, dissector_table_t sub_dissectors)
+dissector_add_uint_sanity_check(const char *name, guint32 pattern, dissector_handle_t handle, dissector_table_t sub_dissectors)
 {
 	dtbl_entry_t *dtbl_entry;
 
@@ -707,7 +709,7 @@ dissector_add_sanity_check(const char *name, guint32 pattern, dissector_handle_t
 
 /* Add an entry to a uint dissector table. */
 void
-dissector_add(const char *name, const guint32 pattern, dissector_handle_t handle)
+dissector_add_uint(const char *name, const guint32 pattern, dissector_handle_t handle)
 {
 	dissector_table_t sub_dissectors;
 	dtbl_entry_t *dtbl_entry;
@@ -723,20 +725,20 @@ dissector_add(const char *name, const guint32 pattern, dissector_handle_t handle
 	case FT_UINT24:
 	case FT_UINT32:
 		/*
-		 * You can do a port lookup in these tables.
+		 * You can do a uint lookup in these tables.
 		 */
 		break;
 
 	default:
 		/*
-		 * But you can't do a port lookup in any other types
+		 * But you can't do a uint lookup in any other types
 		 * of tables.
 		 */
 		g_assert_not_reached();
 	}
 
 #if 0
-	dissector_add_sanity_check(name, pattern, handle, sub_dissectors);
+	dissector_add_uint_sanity_check(name, pattern, handle, sub_dissectors);
 #endif
 
 	dtbl_entry = g_malloc(sizeof (dtbl_entry_t));
@@ -758,12 +760,12 @@ dissector_add(const char *name, const guint32 pattern, dissector_handle_t handle
    with a particular pattern. */
 
 /* NOTE: this doesn't use the dissector call variable. It is included to */
-/*	be consistant with the dissector_add and more importantly to be used */
+/*	be consistant with the dissector_add_uint and more importantly to be used */
 /*	if the technique of adding a temporary dissector is implemented.  */
 /*	If temporary dissectors are deleted, then the original dissector must */
 /*	be available. */
 void
-dissector_delete(const char *name, const guint32 pattern,
+dissector_delete_uint(const char *name, const guint32 pattern,
 	dissector_handle_t handle _U_)
 {
 	dissector_table_t sub_dissectors = find_dissector_table( name);
@@ -794,7 +796,7 @@ dissector_delete(const char *name, const guint32 pattern,
 /* Change the entry for a dissector in a uint dissector table
    with a particular pattern to use a new dissector handle. */
 void
-dissector_change(const char *name, const guint32 pattern, dissector_handle_t handle)
+dissector_change_uint(const char *name, const guint32 pattern, dissector_handle_t handle)
 {
 	dissector_table_t sub_dissectors = find_dissector_table( name);
 	dtbl_entry_t *dtbl_entry;
@@ -830,7 +832,7 @@ dissector_change(const char *name, const guint32 pattern, dissector_handle_t han
 
 /* Reset an entry in a uint dissector table to its initial value. */
 void
-dissector_reset(const char *name, const guint32 pattern)
+dissector_reset_uint(const char *name, const guint32 pattern)
 {
 	dissector_table_t sub_dissectors = find_dissector_table( name);
 	dtbl_entry_t *dtbl_entry;
@@ -863,15 +865,15 @@ dissector_reset(const char *name, const guint32 pattern)
    otherwise return FALSE. */
 
 gboolean
-dissector_try_port_new(dissector_table_t sub_dissectors, const guint32 port,
+dissector_try_uint_new(dissector_table_t sub_dissectors, const guint32 uint_val,
 		       tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const gboolean add_proto_name)
 {
 	dtbl_entry_t *dtbl_entry;
 	struct dissector_handle *handle;
-	guint32 saved_match_port;
+	guint32 saved_match_uint;
 	int ret;
 
-	dtbl_entry = find_uint_dtbl_entry(sub_dissectors, port);
+	dtbl_entry = find_uint_dtbl_entry(sub_dissectors, uint_val);
 	if (dtbl_entry != NULL) {
 		/*
 		 * Is there currently a dissector handle for this entry?
@@ -887,14 +889,14 @@ dissector_try_port_new(dissector_table_t sub_dissectors, const guint32 port,
 		}
 
 		/*
-		 * Save the current value of "pinfo->match_port",
-		 * set it to the port that matched, call the
-		 * dissector, and restore "pinfo->match_port".
+		 * Save the current value of "pinfo->match_uint",
+		 * set it to the uint_val that matched, call the
+		 * dissector, and restore "pinfo->match_uint".
 		 */
-		saved_match_port = pinfo->match_port;
-		pinfo->match_port = port;
+		saved_match_uint = pinfo->match_uint;
+		pinfo->match_uint = uint_val;
 		ret = call_dissector_work(handle, tvb, pinfo, tree, add_proto_name);
-		pinfo->match_port = saved_match_port;
+		pinfo->match_uint = saved_match_uint;
 
 		/*
 		 * If a new-style dissector returned 0, it means that
@@ -915,20 +917,21 @@ dissector_try_port_new(dissector_table_t sub_dissectors, const guint32 port,
 }
 
 gboolean
-dissector_try_port(dissector_table_t sub_dissectors, const guint32 port,
+dissector_try_uint(dissector_table_t sub_dissectors, const guint32 uint_val,
 		   tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 
-	return dissector_try_port_new(sub_dissectors, port, tvb, pinfo, tree, TRUE);
+	return dissector_try_uint_new(sub_dissectors, uint_val, tvb, pinfo, tree, TRUE);
 }
+
 /* Look for a given value in a given uint dissector table and, if found,
    return the dissector handle for that value. */
 dissector_handle_t
-dissector_get_port_handle(dissector_table_t const sub_dissectors, const guint32 port)
+dissector_get_uint_handle(dissector_table_t const sub_dissectors, const guint32 uint_val)
 {
 	dtbl_entry_t *dtbl_entry;
 
-	dtbl_entry = find_uint_dtbl_entry(sub_dissectors, port);
+	dtbl_entry = find_uint_dtbl_entry(sub_dissectors, uint_val);
 	if (dtbl_entry != NULL)
 		return dtbl_entry->current;
 	else
diff --git a/epan/packet.h b/epan/packet.h
index 092741cf3c..9aa604990f 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -86,13 +86,13 @@ typedef enum {
 extern void packet_init(void);
 extern void packet_cleanup(void);
 
-/* Handle for dissectors you call directly or register with "dissector_add()".
+/* Handle for dissectors you call directly or register with "dissector_add_uint()".
    This handle is opaque outside of "packet.c". */
 struct dissector_handle;
 typedef struct dissector_handle *dissector_handle_t;
 
-/* Hash table for matching port numbers and dissectors; this is opaque
-   outside of "packet.c". */
+/* Hash table for matching unsigned integers, or strings, and dissectors;
+   this is opaque outside of "packet.c". */
 struct dissector_table;
 typedef struct dissector_table *dissector_table_t;
 
@@ -167,38 +167,66 @@ extern ftenum_t get_dissector_table_selector_type(const char *name);
 extern int get_dissector_table_base(const char *name);
 
 /* Add an entry to a uint dissector table. */
-extern void dissector_add(const char *abbrev, const guint32 pattern,
+extern void dissector_add_uint(const char *abbrev, const guint32 pattern,
     dissector_handle_t handle);
 
+/* For old code that hasn't yet been changed. */
+#define dissector_add(abbrev, pattern, handle) \
+	dissector_add_uint(abbrev, pattern, handle)
+
 /* Delete the entry for a dissector in a uint dissector table
    with a particular pattern. */
-extern void dissector_delete(const char *name, const guint32 pattern,
+extern void dissector_delete_uint(const char *name, const guint32 pattern,
     dissector_handle_t handle);
 
+/* For old code that hasn't yet been changed. */
+#define dissector_delete(name, pattern, handle) \
+	dissector_delete_uint(name, pattern, handle)
+
 /* Change the entry for a dissector in a uint dissector table
    with a particular pattern to use a new dissector handle. */
-extern void dissector_change(const char *abbrev, const guint32 pattern,
+extern void dissector_change_uint(const char *abbrev, const guint32 pattern,
     dissector_handle_t handle);
 
+/* For old code that hasn't yet been changed. */
+#define dissector_change(abbrev, pattern, handle) \
+	dissector_change_uint(abbrev, pattern, handle)
+
 /* Reset an entry in a uint dissector table to its initial value. */
-extern void dissector_reset(const char *name, const guint32 pattern);
+extern void dissector_reset_uint(const char *name, const guint32 pattern);
+
+/* For old code that hasn't yet been changed. */
+#define dissector_reset(name, pattern) \
+	dissector_reset_uint(name, pattern)
 
 /* Look for a given value in a given uint dissector table and, if found,
    call the dissector with the arguments supplied, and return TRUE,
    otherwise return FALSE. */
-extern gboolean dissector_try_port(dissector_table_t sub_dissectors,
-    const guint32 port, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern gboolean dissector_try_uint(dissector_table_t sub_dissectors,
+    const guint32 uint_val, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+/* For old code that hasn't yet been changed. */
+#define dissector_try_port(sub_dissectors, uint_val, tvb, pinfo, tree) \
+	dissector_try_uint(sub_dissectors, uint_val, tvb, pinfo, tree)
 
 /* Look for a given value in a given uint dissector table and, if found,
    call the dissector with the arguments supplied, and return TRUE,
    otherwise return FALSE. */
-extern gboolean dissector_try_port_new(dissector_table_t sub_dissectors,
-	const guint32 port, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const gboolean add_proto_name);
+extern gboolean dissector_try_uint_new(dissector_table_t sub_dissectors,
+	const guint32 uint_val, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const gboolean add_proto_name);
+
+/* For old code that hasn't yet been changed. */
+#define dissector_try_port_new(sub_dissectors, uint_val, tvb, pinfo, tree, add_proto_name) \
+	dissector_try_uint_new(sub_dissectors, uint_val, tvb, pinfo, tree, add_proto_name)
 
 /* Look for a given value in a given uint dissector table and, if found,
    return the dissector handle for that value. */
-extern dissector_handle_t dissector_get_port_handle(
-    dissector_table_t const sub_dissectors, const guint32 port);
+extern dissector_handle_t dissector_get_uint_handle(
+    dissector_table_t const sub_dissectors, const guint32 uint_val);
+
+/* For old code that hasn't yet been changed. */
+#define dissector_get_port_handle(sub_dissectors, uint_val) \
+	dissector_get_uint_handle(sub_dissectors, uint_val)
 
 /* Add an entry to a string dissector table. */
 extern void dissector_add_string(const char *name, const gchar *pattern,
diff --git a/epan/packet_info.h b/epan/packet_info.h
index 8446685c49..646a24a7be 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -69,7 +69,7 @@ typedef struct _packet_info {
   port_type ptype;		/* type of the following two port numbers */
   guint32 srcport;		/* source port */
   guint32 destport;		/* destination port */
-  guint32 match_port;           /* matched port for calling subdissector from table */
+  guint32 match_uint;           /* matched uint for calling subdissector from table */
   const char *match_string;	/* matched string for calling subdissector from table */
   guint16 can_desegment;	/* >0 if this segment could be desegmented.
 				   A dissector that can offer this API (e.g.
@@ -201,4 +201,7 @@ typedef struct _packet_info {
 							 */
 } packet_info;
 
+/* For old code that hasn't yet been changed. */
+#define match_port	match_uint
+
 #endif /* __PACKET_INFO_H__ */
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index 8ed87efd00..36132bf07c 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -683,7 +683,7 @@ static int Pinfo_match(lua_State *L) {
     if (pinfo->ws_pinfo->match_string) {
         lua_pushstring(L,pinfo->ws_pinfo->match_string);
     } else {
-        lua_pushnumber(L,(lua_Number)(pinfo->ws_pinfo->match_port));
+        lua_pushnumber(L,(lua_Number)(pinfo->ws_pinfo->match_uint));
     }
 
     return 1;
diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c
index 3437f00343..86fbf555b4 100644
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -1538,7 +1538,7 @@ WSLUA_METHOD DissectorTable_add (lua_State *L) {
         dissector_add_string(dt->name, pattern,handle);
     } else if ( type == FT_UINT32 || type == FT_UINT16 || type ==  FT_UINT8 || type ==  FT_UINT24 ) {
         int port = luaL_checkint(L, WSLUA_ARG_DissectorTable_add_PATTERN);
-        dissector_add(dt->name, port, handle);
+        dissector_add_uint(dt->name, port, handle);
     } else {
         luaL_error(L,"Strange type %d for a DissectorTable",type);
     }
@@ -1575,7 +1575,7 @@ WSLUA_METHOD DissectorTable_remove (lua_State *L) {
         dissector_delete_string(dt->name, pattern,handle);
     } else if ( type == FT_UINT32 || type == FT_UINT16 || type ==  FT_UINT8 || type ==  FT_UINT24 ) {
         int port = luaL_checkint(L, 2);
-        dissector_delete(dt->name, port, handle);
+        dissector_delete_uint(dt->name, port, handle);
     }
 
     return 0;
@@ -1613,7 +1613,7 @@ WSLUA_METHOD DissectorTable_try (lua_State *L) {
         } else if ( type == FT_UINT32 || type == FT_UINT16 || type ==  FT_UINT8 || type ==  FT_UINT24 ) {
           int port = luaL_checkint(L, 2);
 
-          if (dissector_try_port(dt->table,port,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree))
+          if (dissector_try_uint(dt->table,port,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree))
               return 0;
 
         } else {
@@ -1655,7 +1655,7 @@ WSLUA_METHOD DissectorTable_get_dissector (lua_State *L) {
         handle = dissector_get_string_handle(dt->table,pattern);
     } else if ( type == FT_UINT32 || type == FT_UINT16 || type ==  FT_UINT8 || type ==  FT_UINT24 ) {
         int port = luaL_checkint(L, WSLUA_ARG_DissectorTable_try_PATTERN);
-        handle = dissector_get_port_handle(dt->table,port);
+        handle = dissector_get_uint_handle(dt->table,port);
     }
 
     if (handle) {
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index fab2b9ccaa..db96c99f53 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -407,7 +407,8 @@ decode_clear_all(void)
         case FT_UINT16:
         case FT_UINT24:
         case FT_UINT32:
-            dissector_reset(item->ddi_table_name, item->ddi_selector.sel_uint);
+            dissector_reset_uint(item->ddi_table_name,
+                                 item->ddi_selector.sel_uint);
             break;
 
         case FT_STRING:
@@ -649,9 +650,9 @@ decode_change_one_dissector(gchar *table_name, guint selector, GtkWidget *list)
     }
 
     if (abbrev != NULL && strcmp(abbrev, "(default)") == 0) {
-        dissector_reset(table_name, selector);
+        dissector_reset_uint(table_name, selector);
     } else {
-        dissector_change(table_name, selector, handle);
+        dissector_change_uint(table_name, selector, handle);
     }
     g_free(abbrev);
 }
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index d5b88260db..4719c16778 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -5101,42 +5101,42 @@ static void
 register_tcp_port(guint32 port)
 {
   if (port != 0)
-    dissector_add("tcp.port", port, asn1_handle);
+    dissector_add_uint("tcp.port", port, asn1_handle);
 }
 
 static void
 unregister_tcp_port(guint32 port)
 {
   if (port != 0)
-    dissector_delete("tcp.port", port, asn1_handle);
+    dissector_delete_uint("tcp.port", port, asn1_handle);
 }
 
 static void
 register_udp_port(guint32 port)
 {
   if (port != 0)
-    dissector_add("udp.port", port, asn1_handle);
+    dissector_add_uint("udp.port", port, asn1_handle);
 }
 
 static void
 unregister_udp_port(guint32 port)
 {
   if (port != 0)
-    dissector_delete("udp.port", port, asn1_handle);
+    dissector_delete_uint("udp.port", port, asn1_handle);
 }
 
 static void
 register_sctp_port(guint32 port)
 {
   if (port != 0)
-    dissector_add("sctp.port", port, asn1_handle);
+    dissector_add_uint("sctp.port", port, asn1_handle);
 }
 
 static void
 unregister_sctp_port(guint32 port)
 {
   if (port != 0)
-    dissector_delete("sctp.port", port, asn1_handle);
+    dissector_delete_uint("sctp.port", port, asn1_handle);
 }
 
 void
diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c
index 2e822a5112..efa74f56af 100644
--- a/plugins/docsis/packet-bintrngreq.c
+++ b/plugins/docsis/packet-bintrngreq.c
@@ -152,5 +152,5 @@ proto_reg_handoff_docsis_bintrngreq (void)
   dissector_handle_t docsis_bintrngreq_handle;
 
   docsis_bintrngreq_handle = find_dissector ("docsis_bintrngreq");
-  dissector_add ("docsis_mgmt", 0x22, docsis_bintrngreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x22, docsis_bintrngreq_handle);
 }
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 85e44412ff..6d9e677f76 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -566,6 +566,6 @@ proto_reg_handoff_docsis_bpkmattr (void)
   dissector_handle_t docsis_bpkmattr_handle;
 
   docsis_bpkmattr_handle = find_dissector ("docsis_bpkmattr");
-  dissector_add ("docsis", 0xFE, docsis_bpkmattr_handle);
+  dissector_add_uint ("docsis", 0xFE, docsis_bpkmattr_handle);
 
 }
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index 5119bc5ce3..9416a4951e 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -161,6 +161,6 @@ proto_reg_handoff_docsis_bpkmreq (void)
 
   docsis_bpkmreq_handle = find_dissector ("docsis_bpkmreq");
   attrs_handle = find_dissector ("docsis_bpkmattr");
-  dissector_add ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle);
 
 }
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index 9e65816ce7..0826c9b2ea 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -160,6 +160,6 @@ proto_reg_handoff_docsis_bpkmrsp (void)
 
   docsis_bpkmrsp_handle = find_dissector ("docsis_bpkmrsp");
   attrs_handle = find_dissector ("docsis_bpkmattr");
-  dissector_add ("docsis_mgmt", 0x0D, docsis_bpkmrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x0D, docsis_bpkmrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c
index a745634cef..7ed5b2599a 100644
--- a/plugins/docsis/packet-cmctrlreq.c
+++ b/plugins/docsis/packet-cmctrlreq.c
@@ -118,5 +118,5 @@ proto_reg_handoff_docsis_cmctrlreq (void)
 
   docsis_cmctrlreq_handle = find_dissector ("docsis_cmctrlreq");
   cmctrl_tlv_handle = find_dissector ("cmctrl_tlv");
-  dissector_add ("docsis_mgmt", 0x2A, docsis_cmctrlreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x2A, docsis_cmctrlreq_handle);
 }
diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c
index 88b3911f98..cb255126e6 100644
--- a/plugins/docsis/packet-cmctrlrsp.c
+++ b/plugins/docsis/packet-cmctrlrsp.c
@@ -126,5 +126,5 @@ proto_reg_handoff_docsis_cmctrlrsp (void)
 
   docsis_cmctrlrsp_handle = find_dissector ("docsis_cmctrlrsp");
   cmctrl_tlv_handle = find_dissector ("cmctrl_tlv");
-  dissector_add ("docsis_mgmt", 0x2B, docsis_cmctrlrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x2B, docsis_cmctrlrsp_handle);
 }
diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c
index cb726c48b8..d8a50f7dde 100644
--- a/plugins/docsis/packet-dbcack.c
+++ b/plugins/docsis/packet-dbcack.c
@@ -113,5 +113,5 @@ proto_reg_handoff_docsis_dbcack (void)
 
   docsis_dbcack_handle = find_dissector ("docsis_dbcack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x26, docsis_dbcack_handle);
+  dissector_add_uint ("docsis_mgmt", 0x26, docsis_dbcack_handle);
 }
diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c
index 20061a740c..6e90d996d3 100644
--- a/plugins/docsis/packet-dbcreq.c
+++ b/plugins/docsis/packet-dbcreq.c
@@ -129,5 +129,5 @@ proto_reg_handoff_docsis_dbcreq (void)
 
   docsis_dbcreq_handle = find_dissector ("docsis_dbcreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x24, docsis_dbcreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x24, docsis_dbcreq_handle);
 }
diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c
index 13d8fab1e9..305f98796e 100644
--- a/plugins/docsis/packet-dbcrsp.c
+++ b/plugins/docsis/packet-dbcrsp.c
@@ -126,5 +126,5 @@ proto_reg_handoff_docsis_dbcrsp (void)
 
   docsis_dbcrsp_handle = find_dissector ("docsis_dbcrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x25, docsis_dbcrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x25, docsis_dbcrsp_handle);
 }
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index 278fa87e50..01d69ca493 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -171,6 +171,6 @@ proto_reg_handoff_docsis_dccack (void)
   dissector_handle_t docsis_dccack_handle;
 
   docsis_dccack_handle = find_dissector ("docsis_dccack");
-  dissector_add ("docsis_mgmt", 0x19, docsis_dccack_handle);
+  dissector_add_uint ("docsis_mgmt", 0x19, docsis_dccack_handle);
 
 }
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index ba88ed41f3..ce7d84f42d 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -602,6 +602,6 @@ proto_reg_handoff_docsis_dccreq (void)
   dissector_handle_t docsis_dccreq_handle;
 
   docsis_dccreq_handle = find_dissector ("docsis_dccreq");
-  dissector_add ("docsis_mgmt", 0x17, docsis_dccreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x17, docsis_dccreq_handle);
 
 }
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index 07bbf4056b..87d2e10506 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -259,6 +259,6 @@ proto_reg_handoff_docsis_dccrsp (void)
   dissector_handle_t docsis_dccrsp_handle;
 
   docsis_dccrsp_handle = find_dissector ("docsis_dccrsp");
-  dissector_add ("docsis_mgmt", 0x18, docsis_dccrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x18, docsis_dccrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index 987dd026c7..20a05401ea 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -848,6 +848,6 @@ proto_reg_handoff_docsis_dcd (void)
   dissector_handle_t docsis_dcd_handle;
 
   docsis_dcd_handle = find_dissector ("docsis_dcd");
-  dissector_add ("docsis_mgmt", 0x20, docsis_dcd_handle);
+  dissector_add_uint ("docsis_mgmt", 0x20, docsis_dcd_handle);
 
 }
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index e69e8801ef..fcf8fcbedc 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -745,7 +745,7 @@ proto_reg_handoff_docsis (void)
 
   docsis_handle = find_dissector ("docsis");
   data_handle = find_dissector ("data");
-  dissector_add ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle);
+  dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle);
 
   docsis_mgmt_handle = find_dissector ("docsis_mgmt");
   eth_withoutfcs_handle = find_dissector ("eth_withoutfcs");
diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c
index 91668e31d4..565e3810ec 100644
--- a/plugins/docsis/packet-dpvreq.c
+++ b/plugins/docsis/packet-dpvreq.c
@@ -178,5 +178,5 @@ proto_reg_handoff_docsis_dpvreq (void)
   dissector_handle_t docsis_dpvreq_handle;
 
   docsis_dpvreq_handle = find_dissector ("docsis_dpvreq");
-  dissector_add ("docsis_mgmt", 0x27, docsis_dpvreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x27, docsis_dpvreq_handle);
 }
diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c
index 96cd5b707e..df320a8458 100644
--- a/plugins/docsis/packet-dpvrsp.c
+++ b/plugins/docsis/packet-dpvrsp.c
@@ -178,5 +178,5 @@ proto_reg_handoff_docsis_dpvrsp (void)
   dissector_handle_t docsis_dpvrsp_handle;
 
   docsis_dpvrsp_handle = find_dissector ("docsis_dpvrsp");
-  dissector_add ("docsis_mgmt", 0x28, docsis_dpvrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x28, docsis_dpvrsp_handle);
 }
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index 54ea240ce3..98fdb9b7fe 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -133,6 +133,6 @@ proto_reg_handoff_docsis_dsaack (void)
 
   docsis_dsaack_handle = find_dissector ("docsis_dsaack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x11, docsis_dsaack_handle);
+  dissector_add_uint ("docsis_mgmt", 0x11, docsis_dsaack_handle);
 
 }
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index 024a10aea7..5724ee5a77 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -122,6 +122,6 @@ proto_reg_handoff_docsis_dsareq (void)
 
   docsis_dsareq_handle = find_dissector ("docsis_dsareq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x0F, docsis_dsareq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x0F, docsis_dsareq_handle);
 
 }
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index f695827ca2..ec9745bb55 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -136,6 +136,6 @@ proto_reg_handoff_docsis_dsarsp (void)
 
   docsis_dsarsp_handle = find_dissector ("docsis_dsarsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x10, docsis_dsarsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x10, docsis_dsarsp_handle);
 
 }
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index cacd65d33a..75ec51fa2a 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -135,6 +135,6 @@ proto_reg_handoff_docsis_dscack (void)
 
   docsis_dscack_handle = find_dissector ("docsis_dscack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x14, docsis_dscack_handle);
+  dissector_add_uint ("docsis_mgmt", 0x14, docsis_dscack_handle);
 
 }
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index d4fbe90a3d..be580e258d 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -123,6 +123,6 @@ proto_reg_handoff_docsis_dscreq (void)
 
   docsis_dscreq_handle = find_dissector ("docsis_dscreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x12, docsis_dscreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x12, docsis_dscreq_handle);
 
 }
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index 72e06bb094..9a9affb7fa 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -134,6 +134,6 @@ proto_reg_handoff_docsis_dscrsp (void)
 
   docsis_dscrsp_handle = find_dissector ("docsis_dscrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x13, docsis_dscrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x13, docsis_dscrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index 2236051dad..2c060f4a0a 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -137,6 +137,6 @@ proto_reg_handoff_docsis_dsdreq (void)
 
   docsis_dsdreq_handle = find_dissector ("docsis_dsdreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x15, docsis_dsdreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x15, docsis_dsdreq_handle);
 
 }
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index 016070969f..a7df2931ab 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -134,6 +134,6 @@ proto_reg_handoff_docsis_dsdrsp (void)
   dissector_handle_t docsis_dsdrsp_handle;
 
   docsis_dsdrsp_handle = find_dissector ("docsis_dsdrsp");
-  dissector_add ("docsis_mgmt", 0x16, docsis_dsdrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x16, docsis_dsdrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index 5f2d89b480..0042a138ba 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -133,6 +133,6 @@ proto_reg_handoff_docsis_intrngreq (void)
   dissector_handle_t docsis_intrngreq_handle;
 
   docsis_intrngreq_handle = find_dissector ("docsis_intrngreq");
-  dissector_add ("docsis_mgmt", 0x1E, docsis_intrngreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x1E, docsis_intrngreq_handle);
 
 }
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 934f181d3a..430e9091a5 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -200,7 +200,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   msg_len = tvb_get_ntohs (tvb, 12);
   payload_tvb = tvb_new_subset (tvb, 20, msg_len - 6, msg_len - 6);
 
-  if (dissector_try_port
+  if (dissector_try_uint
       (docsis_mgmt_dissector_table, type, payload_tvb, pinfo, tree))
     return;
   else
@@ -305,5 +305,5 @@ proto_reg_handoff_docsis_mgmt (void)
   docsis_mgmt_handle = find_dissector ("docsis_mgmt");
   data_handle = find_dissector ("data");
 
-  dissector_add ("docsis", 0x03, docsis_mgmt_handle);
+  dissector_add_uint ("docsis", 0x03, docsis_mgmt_handle);
 }
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index 18d4513973..5eef44901b 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -276,6 +276,6 @@ proto_reg_handoff_docsis_map (void)
   dissector_handle_t docsis_map_handle;
 
   docsis_map_handle = find_dissector ("docsis_map");
-  dissector_add ("docsis_mgmt", 0x03, docsis_map_handle);
+  dissector_add_uint ("docsis_mgmt", 0x03, docsis_map_handle);
 
 }
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index daaaeb2491..3a542c3c5f 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -762,5 +762,5 @@ proto_reg_handoff_docsis_mdd (void)
 	dissector_handle_t docsis_mdd_handle;
 
 	docsis_mdd_handle = find_dissector ("docsis_mdd");
-	dissector_add ("docsis_mgmt", 33, docsis_mdd_handle);
+	dissector_add_uint ("docsis_mgmt", 33, docsis_mdd_handle);
 }
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index 1cdfdf36d4..9544fecc3c 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -133,6 +133,6 @@ proto_reg_handoff_docsis_regack (void)
 
   docsis_regack_handle = find_dissector ("docsis_regack");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x0e, docsis_regack_handle);
+  dissector_add_uint ("docsis_mgmt", 0x0e, docsis_regack_handle);
 
 }
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index d80743eca4..1a6cce5bc8 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -125,6 +125,6 @@ proto_reg_handoff_docsis_regreq (void)
   docsis_regreq_handle = find_dissector ("docsis_regreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
 
-  dissector_add ("docsis_mgmt", 0x06, docsis_regreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x06, docsis_regreq_handle);
 
 }
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index bf4021e326..d2326ec90c 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -132,5 +132,5 @@ proto_reg_handoff_docsis_regreqmp (void)
 
 	docsis_tlv_handle = find_dissector ("docsis_tlv");
 	docsis_regreqmp_handle = find_dissector ("docsis_regreqmp");
-	dissector_add ("docsis_mgmt", 44, docsis_regreqmp_handle);
+	dissector_add_uint ("docsis_mgmt", 44, docsis_regreqmp_handle);
 }
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index 19c550aefe..f868d22ff9 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -131,6 +131,6 @@ proto_reg_handoff_docsis_regrsp (void)
 
   docsis_regrsp_handle = find_dissector ("docsis_regrsp");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x07, docsis_regrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x07, docsis_regrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index a8a857c1af..272a033f37 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -144,5 +144,5 @@ proto_reg_handoff_docsis_regrspmp (void)
 	
 	docsis_tlv_handle = find_dissector ("docsis_tlv");
 	docsis_regrspmp_handle = find_dissector ("docsis_regrspmp");
-	dissector_add ("docsis_mgmt", 45, docsis_regrspmp_handle);
+	dissector_add_uint ("docsis_mgmt", 45, docsis_regrspmp_handle);
 }
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index 985734bc51..1fbb5f25c5 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -136,6 +136,6 @@ proto_reg_handoff_docsis_rngreq (void)
   dissector_handle_t docsis_rngreq_handle;
 
   docsis_rngreq_handle = find_dissector ("docsis_rngreq");
-  dissector_add ("docsis_mgmt", 0x04, docsis_rngreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x04, docsis_rngreq_handle);
 
 }
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index f2cb2c197c..3ec82d4f99 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -274,6 +274,6 @@ proto_reg_handoff_docsis_rngrsp (void)
   dissector_handle_t docsis_rngrsp_handle;
 
   docsis_rngrsp_handle = find_dissector ("docsis_rngrsp");
-  dissector_add ("docsis_mgmt", 0x05, docsis_rngrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x05, docsis_rngrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index 94e42a31ee..a21e54d30f 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -106,5 +106,5 @@ proto_reg_handoff_docsis_sync (void)
 	dissector_handle_t docsis_sync_handle;
 
 	docsis_sync_handle = find_dissector ("docsis_sync");
-	dissector_add ("docsis_mgmt", 1, docsis_sync_handle);
+	dissector_add_uint ("docsis_mgmt", 1, docsis_sync_handle);
 }
diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c
index b466ac465e..b988f5608b 100644
--- a/plugins/docsis/packet-tlv-cmctrl.c
+++ b/plugins/docsis/packet-tlv-cmctrl.c
@@ -350,6 +350,6 @@ proto_reg_handoff_cmctrl_tlv (void)
 
   cmctrl_tlv_handle = find_dissector ("cmctrl_tlv");
 
-  dissector_add ("docsis", 0xFE, cmctrl_tlv_handle);
+  dissector_add_uint ("docsis", 0xFE, cmctrl_tlv_handle);
 }
 
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index c664c9948d..7d0ed83a5e 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -5411,6 +5411,6 @@ proto_reg_handoff_docsis_tlv (void)
   docsis_vsif_handle = find_dissector("docsis_vsif");
   docsis_ucd_handle = find_dissector("docsis_ucd");
 
-  dissector_add ("docsis", 0xFF, docsis_tlv_handle);
+  dissector_add_uint ("docsis", 0xFF, docsis_tlv_handle);
 
 }
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index c33032fc9d..ba812b2ac1 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -1061,6 +1061,6 @@ proto_reg_handoff_docsis_type29ucd (void)
   dissector_handle_t docsis_type29ucd_handle;
 
   docsis_type29ucd_handle = find_dissector ("docsis_type29ucd");
-  dissector_add ("docsis_mgmt", 0x1D, docsis_type29ucd_handle);
+  dissector_add_uint ("docsis_mgmt", 0x1D, docsis_type29ucd_handle);
 
 }
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index f9b80da9e9..c6bd21c676 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -124,6 +124,6 @@ proto_reg_handoff_docsis_uccreq (void)
 
   docsis_uccreq_handle = find_dissector ("docsis_uccreq");
   docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add ("docsis_mgmt", 0x08, docsis_uccreq_handle);
+  dissector_add_uint ("docsis_mgmt", 0x08, docsis_uccreq_handle);
 
 }
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index 8f07607ba1..0006ebe561 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -116,6 +116,6 @@ proto_reg_handoff_docsis_uccrsp (void)
   dissector_handle_t docsis_uccrsp_handle;
 
   docsis_uccrsp_handle = find_dissector ("docsis_uccrsp");
-  dissector_add ("docsis_mgmt", 0x09, docsis_uccrsp_handle);
+  dissector_add_uint ("docsis_mgmt", 0x09, docsis_uccrsp_handle);
 
 }
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index 80b2c9eb6d..f542c40814 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -821,6 +821,6 @@ proto_reg_handoff_docsis_ucd (void)
    dissector_handle_t docsis_ucd_handle;
    
    docsis_ucd_handle = find_dissector ("docsis_ucd");
-   dissector_add ("docsis_mgmt", 0x02, docsis_ucd_handle);
+   dissector_add_uint ("docsis_mgmt", 0x02, docsis_ucd_handle);
    
 }
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index 9b1623074f..f65a704e00 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -294,6 +294,6 @@ proto_reg_handoff_docsis_vsif (void)
   dissector_handle_t docsis_vsif_handle;
 
   docsis_vsif_handle = find_dissector ("docsis_vsif");
-  dissector_add ("docsis", 0xFD, docsis_vsif_handle);
+  dissector_add_uint ("docsis", 0xFD, docsis_vsif_handle);
 
 }
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 4793e813ad..d0fa5df216 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -1207,6 +1207,6 @@ void proto_reg_handoff_ams(void)
    dissector_handle_t ams_handle;
 
    ams_handle = find_dissector("ams");
-   dissector_add("tcp.port", 0xbf02, ams_handle);
-   dissector_add("ecatf.type", 2, ams_handle);
+   dissector_add_uint("tcp.port", 0xbf02, ams_handle);
+   dissector_add_uint("ecatf.type", 2, ams_handle);
 }
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index 7aee5d7430..6d538e35df 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -2039,7 +2039,7 @@ void proto_reg_handoff_ecat_mailbox(void)
 
    /* Register this dissector as a sub dissector to E88A4 based on ether type. */
    ecat_mailbox_handle = find_dissector("ecat_mailbox");
-   dissector_add("ecatf.type", 5, ecat_mailbox_handle);
+   dissector_add_uint("ecatf.type", 5, ecat_mailbox_handle);
 
    eth_handle = find_dissector("eth_withoutfcs");
    ams_handle = find_dissector("ams");
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index 564c100462..493ba8f424 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -1713,7 +1713,7 @@ void proto_reg_handoff_ecat(void)
    /* Register this dissector as a sub dissector to EtherCAT frame based on
       ether type. */
    ecat_handle = create_dissector_handle(dissect_ecat_datagram, proto_ecat_datagram);
-   dissector_add("ecatf.type", 1 /* EtherCAT type */, ecat_handle);
+   dissector_add_uint("ecatf.type", 1 /* EtherCAT type */, ecat_handle);
 
    ecat_mailbox_handle = find_dissector("ecat_mailbox");
 }
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 9ef143b9dc..ba0669e394 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -94,7 +94,7 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree
       handle the rest of the PDU. */
    next_tvb = tvb_new_subset_remaining (tvb, offset);
 
-   if (!dissector_try_port(ethercat_frame_dissector_table, hdr.v.protocol,
+   if (!dissector_try_uint(ethercat_frame_dissector_table, hdr.v.protocol,
        next_tvb, pinfo, tree))
    {
       col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.v.protocol);
@@ -150,8 +150,8 @@ void proto_reg_handoff_ethercat_frame(void)
    dissector_handle_t ethercat_frame_handle;
 
    ethercat_frame_handle = find_dissector("ecatf");
-   dissector_add("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle);
-   dissector_add("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
-   dissector_add("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
+   dissector_add_uint("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle);
+   dissector_add_uint("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
+   dissector_add_uint("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle);
    ethercat_frame_data_handle = find_dissector("data");
 }
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c
index cc1cf59a56..546219fd28 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/ethercat/packet-ioraw.c
@@ -117,5 +117,5 @@ void proto_reg_handoff_ioraw(void)
    dissector_handle_t ioraw_handle;
 
    ioraw_handle = create_dissector_handle(dissect_ioraw, proto_ioraw);
-   dissector_add("ecatf.type", 3, ioraw_handle);
+   dissector_add_uint("ecatf.type", 3, ioraw_handle);
 }
diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c
index 6fee4f589e..6a05fdb370 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/ethercat/packet-nv.c
@@ -237,5 +237,5 @@ void proto_reg_handoff_nv(void)
    dissector_handle_t nv_handle;
 
    nv_handle = create_dissector_handle(dissect_nv, proto_nv);  
-   dissector_add("ecatf.type", 4, nv_handle);
+   dissector_add_uint("ecatf.type", 4, nv_handle);
 }
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 4f139e3cf4..c4b4524a5a 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -2290,5 +2290,5 @@ proto_reg_handoff_gryphon(void)
     dissector_handle_t gryphon_handle;
 
     gryphon_handle = create_dissector_handle(dissect_gryphon, proto_gryphon);
-    dissector_add("tcp.port", 7000, gryphon_handle);
+    dissector_add_uint("tcp.port", 7000, gryphon_handle);
 }
diff --git a/plugins/interlink/packet-interlink.c b/plugins/interlink/packet-interlink.c
index 8b24a25146..c11bcef2bc 100644
--- a/plugins/interlink/packet-interlink.c
+++ b/plugins/interlink/packet-interlink.c
@@ -157,7 +157,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	next_tvb = tvb_new_subset_remaining(tvb, offset);
 
 	/* Probably a sub-dissector exists for this type/version combination. */
-	handle = dissector_get_port_handle(subdissector_table, type_version);
+	handle = dissector_get_uint_handle(subdissector_table, type_version);
 
 	/* Without a proper sub-dissector, we use "data". */
 	if (handle == NULL) handle = data_handle;
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 3a17547dbf..9c122275f9 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -2242,7 +2242,7 @@ void proto_reg_handoff_irda(void)
     dissector_handle_t irda_handle;
     
     irda_handle = find_dissector("irda");
-    dissector_add("wtap_encap", WTAP_ENCAP_IRDA, irda_handle);
-    dissector_add("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_IRDA, irda_handle);
+    dissector_add_uint("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle);
     data_handle = find_dissector("data");
 }
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 54f844e906..ad17b65771 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -180,7 +180,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root)
 void
 proto_reg_handoff_irsir(void)
 {
-	dissector_add("tcp.port", TCP_PORT_SIR, find_dissector("sir"));
+	dissector_add_uint("tcp.port", TCP_PORT_SIR, find_dissector("sir"));
 
 	data_handle = find_dissector("data");
 	irda_handle = find_dissector("irda");
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c
index 2aeee687bb..6aac56312f 100644
--- a/plugins/m2m/packet-m2m.c
+++ b/plugins/m2m/packet-m2m.c
@@ -779,7 +779,7 @@ void proto_reg_handoff_m2m(void)
 	dissector_handle_t m2m_handle;
 
 	m2m_handle = create_dissector_handle(dissect_m2m, proto_m2m);
-	dissector_add("ethertype", ETHERTYPE_WMX_M2M, m2m_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_WMX_M2M, m2m_handle);
 
 	/* find the wimax handlers */
 	wimax_cdma_code_burst_handle      = find_dissector("wimax_cdma_code_burst_handler");
diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c
index 2de50733a2..683ed5bfcb 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/opcua/opcua.c
@@ -243,13 +243,13 @@ static void dissect_opcua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 static void register_tcp_port(guint32 port)
 {
   if (port != 0)
-    dissector_add("tcp.port", port, opcua_handle);
+    dissector_add_uint("tcp.port", port, opcua_handle);
 }
 
 static void unregister_tcp_port(guint32 port)
 {
   if (port != 0)
-    dissector_delete("tcp.port", port, opcua_handle);
+    dissector_delete_uint("tcp.port", port, opcua_handle);
 }
 
 void proto_reg_handoff_opcua(void)
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index fce2d08457..9c34ea4430 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -454,6 +454,6 @@ proto_reg_handoff_pn_mrp (void)
 
 
 	mrp_handle = create_dissector_handle(dissect_PNMRP,proto_pn_mrp);
-	dissector_add("ethertype", ETHERTYPE_MRP, mrp_handle);
+	dissector_add_uint("ethertype", ETHERTYPE_MRP, mrp_handle);
 
 }
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 1b289ec576..50b42a347d 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -769,8 +769,8 @@ proto_reg_handoff_pn_rt(void)
 
   pn_rt_handle = create_dissector_handle(dissect_pn_rt, proto_pn_rt);
 
-  dissector_add("ethertype", ETHERTYPE_PROFINET, pn_rt_handle);
-  dissector_add("udp.port", 0x8892, pn_rt_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_PROFINET, pn_rt_handle);
+  dissector_add_uint("udp.port", 0x8892, pn_rt_handle);
 
   heur_dissector_add("pn_rt", dissect_CSF_SDU_heur, proto_pn_rt);
   heur_dissector_add("pn_rt", dissect_FRAG_PDU_heur, proto_pn_rt);  
diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c
index fa4288aee5..e0af9e8386 100644
--- a/plugins/sercosiii/packet-sercosiii_1v1.c
+++ b/plugins/sercosiii/packet-sercosiii_1v1.c
@@ -114,5 +114,5 @@ proto_reg_handoff_sercosiii(void)
   dissector_handle_t siii_handle;
 
   siii_handle = create_dissector_handle(dissect_siii, proto_siii);
-  dissector_add("ethertype", ETHERTYPE_SERCOS, siii_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_SERCOS, siii_handle);
 }
diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c
index c54df654bc..7da2b0cbe5 100644
--- a/plugins/tpg/packet-http.c
+++ b/plugins/tpg/packet-http.c
@@ -97,8 +97,8 @@ static void proto_register_http(void) {
 static void proto_reg_handoff_http(void) {
     http_handle = create_dissector_handle(dissect_http, proto_http);
 
-    dissector_delete("tcp.port", 80, NULL);
-    dissector_add("tcp.port", 80, http_handle);
+    dissector_delete_uint("tcp.port", 80, NULL);
+    dissector_add_uint("tcp.port", 80, http_handle);
 
 }
 
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index cfec629c36..2f1bb21c68 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -4022,12 +4022,12 @@ proto_reg_handoff_unistim(void) {
       initialized=TRUE;
    } else {
       if (unistim_port != 0) {
-         dissector_delete("udp.port",unistim_port,unistim_handle);
+         dissector_delete_uint("udp.port",unistim_port,unistim_handle);
       }
    }
 
    if (global_unistim_port != 0) {
-      dissector_add("udp.port",global_unistim_port,unistim_handle);
+      dissector_add_uint("udp.port",global_unistim_port,unistim_handle);
    }
    unistim_port = global_unistim_port;
 }
diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c
index 784d9f89bf..6e19f45479 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/wimax/packet-wmx.c
@@ -903,12 +903,12 @@ proto_reg_handoff_wimax(void)
                 wimax_handle = create_dissector_handle(dissect_wimax, proto_wimax);
                 wimax_prefs_initialized = TRUE;
         } else {
-                dissector_delete("wimax.max_basic_cid", global_cid_max_basic, wimax_handle);
-                dissector_delete("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle);
+                dissector_delete_uint("wimax.max_basic_cid", global_cid_max_basic, wimax_handle);
+                dissector_delete_uint("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle);
 
         }
 
-	dissector_add("wimax.max_basic_cid", global_cid_max_basic, wimax_handle);
-	dissector_add("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle);
+	dissector_add_uint("wimax.max_basic_cid", global_cid_max_basic, wimax_handle);
+	dissector_add_uint("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle);
 #endif
 }
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index 7281ee2b72..4b1f2caad6 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -3533,12 +3533,12 @@ proto_reg_handoff_wimaxasncp(void)
     if (currentPort != -1)
     {
         /* Remove any previous registered port */
-        dissector_delete("udp.port", currentPort, wimaxasncp_handle);
+        dissector_delete_uint("udp.port", currentPort, wimaxasncp_handle);
     }
 
     /* Add the new one from preferences */
     currentPort = global_wimaxasncp_udp_port;
-    dissector_add("udp.port", currentPort, wimaxasncp_handle);
+    dissector_add_uint("udp.port", currentPort, wimaxasncp_handle);
 
     /* Find the EAP dissector */
     eap_handle = find_dissector("eap");
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index 86e89e249d..7302d78450 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -1833,7 +1833,10 @@ class EthCtx:
       if (pdu['new']): new_prefix = 'new_'
       if (reg['rtype'] in ('NUM', 'STR')):
         rstr = ''
-        if (reg['rtype'] == 'STR'): rstr = '_string'
+        if (reg['rtype'] == 'STR'):
+	  rstr = 'string'
+        else:
+	  rstr = 'uint'
         if (pdu['reg']):
           dis = self.proto
           if (pdu['reg'] != '.'): dis += '.' + pdu['reg']
@@ -1844,7 +1847,7 @@ class EthCtx:
         else:
           hnd = '%screate_dissector_handle(dissect_%s, proto_%s)' % (new_prefix, f, self.eproto)
         rport = self.value_get_eth(reg['rport'])
-        fx.write('  dissector_add%s("%s", %s, %s);\n' % (rstr, reg['rtable'], rport, hnd))
+        fx.write('  dissector_add_%s("%s", %s, %s);\n' % (rstr, reg['rtable'], rport, hnd))
       elif (reg['rtype'] in ('BER', 'PER')):
         roid = self.value_get_eth(reg['roid'])
         fx.write('  %sregister_%s_oid_dissector(%s, dissect_%s, proto_%s, %s);\n' % (new_prefix, reg['rtype'].lower(), roid, f, self.eproto, reg['roidname']))
diff --git a/tshark.c b/tshark.c
index 155970a294..5032086ba3 100644
--- a/tshark.c
+++ b/tshark.c
@@ -658,7 +658,7 @@ add_decode_as(const gchar *cl_param)
   case FT_UINT24:
   case FT_UINT32:
     /* The selector for this table is an unsigned number. */
-    dissector_change(table_name, selector, dissector_matching);
+    dissector_change_uint(table_name, selector, dissector_matching);
     break;
 
   case FT_STRING: