For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
[obnox/wireshark/wip.git] / epan / dissectors / packet-ansi_map.c
index b2dd25b26eccb7c07b83606777404d8870ea5e97..cb0704332a41b4ec19a7828e2ef7214664f24027 100644 (file)
@@ -1,11 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-ansi_map.c                                                          */
-/* ../../tools/asn2wrs.py -b -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . ansi_map.asn */
+/* ../../tools/asn2wrs.py -b -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . -O ../../epan/dissectors ansi_map.asn */
 
 /* Input file: packet-ansi_map-template.c */
 
-#line 1 "packet-ansi_map-template.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-template.c"
 /* packet-ansi_map.c
  * Routines for ANSI 41 Mobile Application Part (IS41 MAP) dissection
  * Specications from 3GPP2 (www.3gpp2.org)
 #include <epan/tap.h>
 #include <epan/asn1.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include "packet-ber.h"
 #include "packet-ansi_map.h"
 #include "packet-ansi_a.h"
 /* Preference settings default */
 #define MAX_SSN 254
 static range_t *global_ssn_range;
+gint ansi_map_response_matching_type = 1;
+
+#define ANSI_MAP_TID_ONLY 0
 
 static dissector_handle_t ansi_map_handle=NULL;
 
@@ -329,7 +329,7 @@ static int hf_ansi_map_pacaindicator_pa = -1;
 
 
 /*--- Included file: packet-ansi_map-hf.c ---*/
-#line 1 "packet-ansi_map-hf.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-hf.c"
 static int hf_ansi_map_electronicSerialNumber = -1;  /* ElectronicSerialNumber */
 static int hf_ansi_map_msid = -1;                 /* MSID */
 static int hf_ansi_map_authenticationAlgorithmVersion = -1;  /* AuthenticationAlgorithmVersion */
@@ -526,6 +526,7 @@ static int hf_ansi_map_authenticationCapability = -1;  /* AuthenticationCapabili
 static int hf_ansi_map_callingFeaturesIndicator = -1;  /* CallingFeaturesIndicator */
 static int hf_ansi_map_geographicAuthorization = -1;  /* GeographicAuthorization */
 static int hf_ansi_map_meidValidated = -1;        /* MEIDValidated */
+static int hf_ansi_map_mobilePositionCapability = -1;  /* MobilePositionCapability */
 static int hf_ansi_map_originationIndicator = -1;  /* OriginationIndicator */
 static int hf_ansi_map_restrictionDigits = -1;    /* RestrictionDigits */
 static int hf_ansi_map_sms_OriginationRestrictions = -1;  /* SMS_OriginationRestrictions */
@@ -606,7 +607,6 @@ static int hf_ansi_map_pSID_RSIDInformation = -1;  /* PSID_RSIDInformation */
 static int hf_ansi_map_positionRequestType = -1;  /* PositionRequestType */
 static int hf_ansi_map_lcsBillingID = -1;         /* LCSBillingID */
 static int hf_ansi_map_lcs_Client_ID = -1;        /* LCS_Client_ID */
-static int hf_ansi_map_mobilePositionCapability = -1;  /* MobilePositionCapability */
 static int hf_ansi_map_dtxIndication = -1;        /* DTXIndication */
 static int hf_ansi_map_cdmaCodeChannel = -1;      /* CDMACodeChannel */
 static int hf_ansi_map_cdmaMobileCapabilities = -1;  /* CDMAMobileCapabilities */
@@ -849,6 +849,7 @@ static int hf_ansi_map_changeFacilitiesRes = -1;  /* ChangeFacilitiesRes */
 static int hf_ansi_map_changeServiceRes = -1;     /* ChangeServiceRes */
 static int hf_ansi_map_parameterRequestRes = -1;  /* ParameterRequestRes */
 static int hf_ansi_map_tMSIDirectiveRes = -1;     /* TMSIDirectiveRes */
+static int hf_ansi_map_numberPortabilityRequestRes = -1;  /* NumberPortabilityRequestRes */
 static int hf_ansi_map_serviceRequestRes = -1;    /* ServiceRequestRes */
 static int hf_ansi_map_analyzedInformationRes = -1;  /* AnalyzedInformationRes */
 static int hf_ansi_map_facilitySelectedAndAvailableRes = -1;  /* FacilitySelectedAndAvailableRes */
@@ -878,7 +879,7 @@ static int hf_ansi_map_interSystemSMSDeliveryPointToPointRes = -1;  /* InterSyst
 static int hf_ansi_map_qualificationRequest2Res = -1;  /* QualificationRequest2Res */
 
 /*--- End of included file: packet-ansi_map-hf.c ---*/
-#line 323 "packet-ansi_map-template.c"
+#line 323 "../../asn1/ansi_map/packet-ansi_map-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ansi_map = -1;
@@ -912,7 +913,7 @@ static gint ett_sms_originationrestrictions = -1;
 
 
 /*--- Included file: packet-ansi_map-ett.c ---*/
-#line 1 "packet-ansi_map-ett.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-ett.c"
 static gint ett_ansi_map_AuthenticationDirective_U = -1;
 static gint ett_ansi_map_AuthenticationDirectiveRes_U = -1;
 static gint ett_ansi_map_AuthenticationDirectiveForward_U = -1;
@@ -1008,6 +1009,7 @@ static gint ett_ansi_map_ParameterRequestRes_U = -1;
 static gint ett_ansi_map_TMSIDirective_U = -1;
 static gint ett_ansi_map_TMSIDirectiveRes_U = -1;
 static gint ett_ansi_map_NumberPortabilityRequest_U = -1;
+static gint ett_ansi_map_NumberPortabilityRequestRes_U = -1;
 static gint ett_ansi_map_ServiceRequest_U = -1;
 static gint ett_ansi_map_ServiceRequestRes_U = -1;
 static gint ett_ansi_map_AnalyzedInformation_U = -1;
@@ -1137,7 +1139,7 @@ static gint ett_ansi_map_InvokeData = -1;
 static gint ett_ansi_map_ReturnData = -1;
 
 /*--- End of included file: packet-ansi_map-ett.c ---*/
-#line 355 "packet-ansi_map-template.c"
+#line 355 "../../asn1/ansi_map/packet-ansi_map-template.c"
 
 /* Global variables */
 static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */
@@ -1176,7 +1178,7 @@ TransactionId_table_cleanup(gpointer key , gpointer value, gpointer user_data _U
 
 }
 
-void
+static void
 ansi_map_init_transaction_table(void){
 
     /* Destroy any existing memory chunks / hashes. */
@@ -1217,7 +1219,17 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
         if ((!pinfo->fd->flags.visited)&&(p_private_tcap->TransactionID_str)){
             /* Only do this once XXX I hope its the right thing to do */
             /* The hash string needs to contain src and dest to distiguish differnt flows */
-            g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,src_str,dst_str);
+                       switch(ansi_map_response_matching_type){
+                               case ANSI_MAP_TID_ONLY:
+                                       g_snprintf(buf,1024,"%s",p_private_tcap->TransactionID_str);
+                                       break;
+                               case 1:
+                                       g_snprintf(buf,1024,"%s%s",p_private_tcap->TransactionID_str,src_str);
+                                       break;
+                               default:
+                                       g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,src_str,dst_str);
+                                       break;
+                       }
             /* If the entry allready exists don't owervrite it */
             ansi_map_saved_invokedata = g_hash_table_lookup(TransactionId_table,buf);
             if(ansi_map_saved_invokedata)
@@ -1230,9 +1242,8 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
             g_hash_table_insert(TransactionId_table,
                                 g_strdup(buf),
                                 ansi_map_saved_invokedata);
-            /*
-              g_warning("Invoke Hash string %s",buf);
-            */
+
+            /*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->fd->num);*/
         }
     }
 
@@ -1341,22 +1352,34 @@ const value_string ansi_map_opr_code_strings[] = {
     { 100, "Drop Service" },
     { 101, "InterSystemSMSPage" },
     { 102, "LCSParameterRequest" },
+    { 103, "Unknown ANSI-MAP PDU" },
+    { 104, "Unknown ANSI-MAP PDU" },
+    { 105, "Unknown ANSI-MAP PDU" },
     { 106, "PositionEventNotification" },
+    { 107, "Unknown ANSI-MAP PDU" },
+    { 108, "Unknown ANSI-MAP PDU" },
+    { 109, "Unknown ANSI-MAP PDU" },
+    { 110, "Unknown ANSI-MAP PDU" },
     { 111, "InterSystemSMSDelivery-PointToPoint" },
     { 112, "QualificationRequest2" },
     {   0, NULL },
 };
+static value_string_ext ansi_map_opr_code_strings_ext = VALUE_STRING_EXT_INIT(ansi_map_opr_code_strings);
 
 static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
 static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset,  asn1_ctx_t *actx);
 static int dissect_ansi_map_SystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_);
 
+#if 0
+/* Moved to tvbuff.h
+ * XXX remove after trial period.
+ */
 typedef struct dgt_set_t
 {
     unsigned char out[15];
 }
 dgt_set_t;
-
+#endif
 static dgt_set_t Dgt_tbcd = {
     {
   /*  0   1   2   3   4   5   6   7   8   9   a   b   c   d   e */
@@ -1371,7 +1394,7 @@ static dgt_set_t Dgt1_9_bcd = {
 };
 /* Assumes the rest of the tvb contains the digits to be turned into a string
  */
-static char*
+static const char*
 unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
 
     int length;
@@ -1472,7 +1495,7 @@ static const value_string ansi_map_np_vals[]  = {
 
 static void
 dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
-    char *digit_str;
+    const char *digit_str;
     int   offset = 0;
 
     proto_tree *subtree;
@@ -1491,7 +1514,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     guint8 octet , octet_len;
     guint8 b1,b2,b3,b4;
     int    offset = 0;
-    char  *digit_str;
+    const char *digit_str;
 
     proto_tree *subtree;
 
@@ -1499,20 +1522,20 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     subtree = proto_item_add_subtree(actx->created_item, ett_digitstype);
 
     /* Octet 1 */
-    proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_type_of_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Octet 2 */
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitD, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_navail, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_pi, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_na, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_si, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitD, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_navail, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_pi, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_na, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Octet 3 */
     octet = tvb_get_guint8(tvb,offset);
-    proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_np, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_digits_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Octet 4 - */
     switch(octet>>4){
@@ -1521,7 +1544,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
         case 1:
             /* BCD Coding */
             octet_len = tvb_get_guint8(tvb,offset);
-            proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
+            proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
             if(octet_len == 0)
                 return;
             offset++;
@@ -1532,11 +1555,11 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
         case 2:
             /* IA5 Coding */
             octet_len = tvb_get_guint8(tvb,offset);
-            proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
+            proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
             if(octet_len == 0)
                 return;
             offset++;
-            proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, FALSE);
+            proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
             proto_item_append_text(actx->created_item, " - %s", tvb_get_ephemeral_string(tvb,offset,tvb_length_remaining(tvb,offset)));
             break;
         case 3:
@@ -1556,7 +1579,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     case 6:/* Land Mobile Numbering (ITU-T Rec. E.212) */
     case 7:/* Private Numbering Plan */
         octet_len = tvb_get_guint8(tvb,offset);
-        proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, FALSE);
+        proto_tree_add_item(subtree, hf_ansi_map_nr_digits, tvb, offset, 1, ENC_BIG_ENDIAN);
         if(octet_len == 0)
             return;
         offset++;
@@ -1569,7 +1592,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
             break;
         case 2:
             /* IA5 Coding */
-            proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, FALSE);
+            proto_tree_add_item(subtree, hf_ansi_map_ia5_digits, tvb, offset, -1, ENC_ASCII|ENC_NA);
             proto_item_append_text(actx->created_item, " - %s", tvb_get_ephemeral_string(tvb,offset,tvb_length_remaining(tvb,offset)));
             break;
         case 3:
@@ -1638,9 +1661,9 @@ dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* Type of Subaddress (octet 1, bits E-G) */
-    proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_subaddr_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Odd/Even Indicator (O/E) (octet 1, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_subaddr_odd_even, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_subaddr_odd_even, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /*
@@ -1676,6 +1699,8 @@ static const value_string ansi_map_ActionCode_vals[]  = {
     {  23, "CDMA Handset-Based Position Determination Complete"},
     {   0, NULL }
 };
+static value_string_ext ansi_map_ActionCode_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_ActionCode_vals);
+
 /* 6.5.2.3 AlertCode */
 
 /* Pitch (octet 1, bits G-H) */
@@ -1734,13 +1759,13 @@ dissect_ansi_map_alertcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* Pitch (octet 1, bits G-H) */
-    proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_alertcode_pitch, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Cadence (octet 1, bits A-F) */
-    proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_alertcode_cadence, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
 
     /* Alert Action (octet 2, bits A-C) */
-    proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_alertcode_alertaction, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.4 AlertResult */
@@ -1890,20 +1915,20 @@ dissect_ansi_map_announcementcode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
 
     /* Tone (octet 1) */
-    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_tone, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Class (octet 2, bits A-D) */
-    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_class, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Standard Announcement (octet 3) */
-    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_std_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Custom Announcement ( octet 4 )
        e.       The assignment of this octet is left to bilateral agreement. When a Custom
        Announcement is specified it takes precedence over either the Standard
        Announcement or Tone
     */
-    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_announcementcode_cust_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.8 AuthenticationCapability Updated N.S0003*/
@@ -1944,9 +1969,9 @@ dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_, prot
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
-    proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_authorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.15 AvailabilityType */
@@ -1967,14 +1992,14 @@ dissect_ansi_map_billingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
 
-    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* ID Number */
-    proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset = offset + 3;
-    proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2001,70 +2026,70 @@ dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_,
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
     /* Call Waiting: FeatureActivity, CW-FA (Octet 1 bits GH )          */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cwfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cwfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Forwarding No Answer FeatureActivity, CFNA-FA (Octet 1 bits EF )    */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfnafa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfnafa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Forwarding Busy FeatureActivity, CFB-FA (Octet 1 bits CD )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfbfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfbfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Forwarding Unconditional FeatureActivity, CFU-FA (Octet 1 bits AB ) */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfufa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cfufa, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     length--;
 
     /* Call Transfer: FeatureActivity, CT-FA (Octet 2 bits GH )         */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ctfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ctfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Voice Privacy FeatureActivity, VP-FA (Octet 2 bits EF )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_vpfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_vpfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Delivery: FeatureActivity (not interpreted on reception by IS-41-C or later)
        CD-FA (Octet 2 bits CD )         */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cdfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cdfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Three-Way Calling FeatureActivity, 3WC-FA (Octet 2 bits AB )     */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_3wcfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_3wcfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     length--;
 
 
     /* Calling Number Identification Restriction Override FeatureActivity CNIROver-FA (Octet 3 bits GH )        */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cniroverfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Calling Number Identification Restriction: FeatureActivity CNIR-FA (Octet 3 bits EF )    */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnirfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Calling Number Identification Presentation: FeatureActivity CNIP2-FA (Octet 3 bits CD )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip2fa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Calling Number Identification Presentation: FeatureActivity CNIP1-FA (Octet 3 bits AB )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cnip1fa, tvb, offset, 1, ENC_BIG_ENDIAN);
     length--;
     if ( length == 0)
         return;
     offset++;
 
     /* USCF divert to voice mail: FeatureActivity USCFvm-FA (Octet 4 bits GH )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfvmfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Answer Hold: FeatureActivity AH-FA (Octet 4 bits EF ) N.S0029-0 v1.0     */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ahfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Data Privacy Feature Activity DP-FA (Octet 4 bits CD ) N.S0008-0 v 1.0   */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_dpfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Priority Call Waiting FeatureActivity PCW-FA (Octet 4 bits AB )  */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_pcwfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     length--;
     if ( length == 0)
         return;
     offset++;
 
     /* USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA (Octet 5 bits AB ) */
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfmsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* USCF divert to network registered DN:FeatureActivity. USCFnr-FA (Octet 5 bits CD )*/
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_uscfnrfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* CDMA-Packet Data Service: FeatureActivity. CPDS-FA (Octet 5 bits EF ) N.S0029-0 v1.0*/
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_cpdsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* CDMA-Concurrent Service:FeatureActivity. CCS-FA (Octet 5 bits GH ) N.S0029-0 v1.0*/
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_ccsfa, tvb, offset, 1, ENC_BIG_ENDIAN);
     length--;
     if ( length == 0)
         return;
     offset++;
 
     /* TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA (Octet 6 bits AB ) N.S0029-0 v1.0*/
-    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_callingfeaturesindicator_epefa, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
@@ -2158,21 +2183,21 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
     /* Call Mode (octet 1, bit H) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls5, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls5, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls4, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls4, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls3, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls3, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls2, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls2, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls1, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls1, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_namps, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_namps, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_amps, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_amps, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cdma, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cdma, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     length--;
     if ( length == 0)
@@ -2180,15 +2205,15 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     offset++;
 
     /* Call Mode (octet 2, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls10, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls10, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 2, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls9, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls9, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 2, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls8, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls8, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 2, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls7, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls7, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Call Mode (octet 2, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls6, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cls6, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.30 CDMAChannelData */
@@ -2212,37 +2237,37 @@ dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmachanneldata);
 
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_Frame_Offset, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* CDMA Channel Number */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_CDMA_ch_no, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     length = length -2;
     /* Band Class */
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_band_cls, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Long Code Mask */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b6, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b5, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b4, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b3, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b2, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_lc_mask_b1, tvb, offset, 1, ENC_BIG_ENDIAN);
     length = length - 6;
     if (length == 0)
         return;
     offset++;
     /* NP_EXT */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_np_ext, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_np_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Nominal Power */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nominal_pwr, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Number Preamble */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmachanneldata_nr_preamble, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.31 CDMACodeChannel */
@@ -2282,16 +2307,16 @@ dissect_ansi_map_cdmastationclassmark(tvbuff_t *tvb, packet_info *pinfo _U_, pro
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmastationclassmark);
 
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Dual-mode Indicator(DMI) (octet 1, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dmi, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dmi, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Slotted Mode Indicator: (SMI) (octet 1, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_smi, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_smi, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitED, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Analog Transmission: (DTX) (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dtx, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_dtx, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Power Class: (PC) (octet 1, bits A and B) */
-    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmastationclassmark_pc, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 /* 6.5.2.47 ChannelData */
 /* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
@@ -2314,15 +2339,15 @@ dissect_ansi_map_channeldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
     subtree = proto_item_add_subtree(actx->created_item, ett_channeldata);
 
     /* SAT Color Code (SCC) (octet 1, bits H and G) */
-    proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_channeldata_scc, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Discontinuous Transmission Mode (DTX) (octet 1, bits E and D) */
-    proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_channeldata_dtx, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Voice Mobile Attenuation Code (VMAC) (octet 1, bits A - C)*/
-    proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_channeldata_vmac, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     offset++;
     /* Channel Number (CHNO) ( octet 2 and 3 ) */
-    proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_channeldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
 
 }
 
@@ -2344,11 +2369,11 @@ dissect_ansi_map_confidentialitymodes(tvbuff_t *tvb, packet_info *pinfo _U_, pro
     subtree = proto_item_add_subtree(actx->created_item, ett_confidentialitymodes);
 
     /* DataPrivacy (DP) Confidentiality Status (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_dp, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_dp, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Signaling Message Encryption (SE) Confidentiality Status (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_se, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_se, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Voice Privacy (VP) Confidentiality Status (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_vp, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_ConfidentialityModes_vp, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2371,20 +2396,20 @@ dissect_ansi_map_controlchanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto
     subtree = proto_item_add_subtree(actx->created_item, ett_controlchanneldata);
 
     /* Digital Color Code (DCC) (octet 1, bit H and G) */
-    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_dcc, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitFED, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Control Mobile Attenuation Code (CMAC) (octet 1, bit A - C) */
-    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_cmac, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Channel Number (CHNO) ( octet 2 and 3 ) */
-    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_chno, tvb, offset, 2, ENC_BIG_ENDIAN);
     /* Supplementary Digital Color Codes (SDCC1 and SDCC2) */
     offset = offset +2;
     /* SDCC1 ( octet 4, bit D and C )*/
-    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* SDCC2 ( octet 4, bit A and B )*/
-    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_controlchanneldata_sdcc2, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2427,9 +2452,9 @@ dissect_ansi_map_deniedauthorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
-    proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_deniedauthorizationperiod_period, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_value, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2462,11 +2487,11 @@ dissect_ansi_map_extendedmscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     subtree = proto_item_add_subtree(actx->created_item, ett_extendedmscid);
     /* Type (octet 1) */
-    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
-    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.65 ExtendedSystemMyTypeCode */
@@ -2480,7 +2505,7 @@ dissect_ansi_map_extendedsystemmytypecode(tvbuff_t *tvb, packet_info *pinfo _U_,
 
     subtree = proto_item_add_subtree(actx->created_item, ett_extendedsystemmytypecode);
     /* Type (octet 1) */
-    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     offset = dissect_ansi_map_SystemMyTypeCode(TRUE, tvb, offset, actx, subtree, hf_ansi_map_systemMyTypeCode);
 }
@@ -2518,7 +2543,7 @@ dissect_ansi_map_handoffstate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     subtree = proto_item_add_subtree(actx->created_item, ett_handoffstate);
     /* Party Involved (PI) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_handoffstate_pi, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_handoffstate_pi, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.72 InterMSCCircuitID */
@@ -2535,11 +2560,11 @@ dissect_ansi_map_intermsccircuitid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* Trunk Group Number (G) Octet 1 */
     octet = tvb_get_guint8(tvb,offset);
-    proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Trunk Member Number (M) Octet2 */
     octet2 = tvb_get_guint8(tvb,offset);
-    proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
     proto_item_append_text(actx->created_item, " (G %u/M %u)", octet, octet2);
 }
 
@@ -2562,10 +2587,10 @@ dissect_ansi_map_messagewaitingnotificationcount(tvbuff_t *tvb, packet_info *pin
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* Type of messages (octet 1) */
-    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_tom, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Number of Messages Waiting (octet 2) */
-    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationcount_no_mw, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2600,11 +2625,11 @@ dissect_ansi_map_messagewaitingnotificationtype(tvbuff_t *tvb, packet_info *pinf
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
 
     /* Message Waiting Indication (MWI) (octet 1, bits C and D) */
-    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_mwi, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Alert Pip Tone (APT) (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_apt, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_apt, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Pip Tone (PT) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_messagewaitingnotificationtype_pt, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.81 MobileIdentificationNumber */
@@ -2620,9 +2645,9 @@ dissect_ansi_map_mscid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
-    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
@@ -2637,13 +2662,13 @@ dissect_ansi_map_mslocation(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
     /* Latitude in tenths of a second octet 1 - 3 */
-    proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_mslocation_lat, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset = offset + 3;
     /* Longitude in tenths of a second octet 4 - 6 */
-    proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_mslocation_long, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset = offset + 3;
     /* Resolution in units of 1 foot octet 7, octet 8 optional */
-    proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_mslocation_res, tvb, offset, -1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.85 NAMPSCallMode */
@@ -2656,8 +2681,8 @@ dissect_ansi_map_nampscallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
     /* Call Mode (octet 1, bits A and B) */
-    proto_tree_add_item(subtree, hf_ansi_map_nampscallmode_amps, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_nampscallmode_namps, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_nampscallmode_amps, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_nampscallmode_namps, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.86 NAMPSChannelData */
@@ -2693,9 +2718,9 @@ dissect_ansi_map_nampschanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
     /* Color Code Indicator (CCIndicator) (octet 1, bits C, D, and E) */
-    proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_CCIndicator, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Narrow Analog Voice Channel Assignment (NAVCA) (octet 1, bits A and B) */
-    proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_nampschanneldata_navca, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -2937,69 +2962,69 @@ dissect_ansi_map_originationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
     subtree = proto_item_add_subtree(actx->created_item, ett_originationtriggers);
 
     /* Revertive Call (RvtC) (octet 1, bit H)*/
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_rvtc, tvb, offset,     1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_rvtc, tvb, offset,     1, ENC_BIG_ENDIAN);
     /* Unrecognized Number (Unrec) (octet 1, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_unrec, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_unrec, tvb, offset,    1, ENC_BIG_ENDIAN);
     /* World Zone (WZ) (octet 1, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_wz, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_wz, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* International (Int'l ) (octet 1, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_int, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_int, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* Inter-LATA Toll (OLATA) (octet 1, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_olata, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_olata, tvb, offset,    1, ENC_BIG_ENDIAN);
     /* Intra-LATA Toll (ILATA) (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ilata, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ilata, tvb, offset,    1, ENC_BIG_ENDIAN);
     /* Local (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_local, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_local, tvb, offset,    1, ENC_BIG_ENDIAN);
     /* All Origination (All) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_all, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_all, tvb, offset,      1, ENC_BIG_ENDIAN);
     offset++;
 
     /*Prior Agreement (PA) (octet 2, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_pa, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_pa, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* Double Pound (DP) (octet 2, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_dp, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_dp, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* Pound (octet 2, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_pound, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_pound, tvb, offset,    1, ENC_BIG_ENDIAN);
     /* Double Star (DS) (octet 2, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ds, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ds, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* Star (octet 2, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_star, tvb, offset,     1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_star, tvb, offset,     1, ENC_BIG_ENDIAN);
     offset++;
 
     /* 7 digit (octet 3, bit H) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_sevendig, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_sevendig, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* 6 digit (octet 3, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_sixdig, tvb, offset,   1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_sixdig, tvb, offset,   1, ENC_BIG_ENDIAN);
     /* 5 digit (octet 3, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fivedig, tvb, offset,  1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fivedig, tvb, offset,  1, ENC_BIG_ENDIAN);
     /* 4 digit (octet 3, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fourdig, tvb, offset,  1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fourdig, tvb, offset,  1, ENC_BIG_ENDIAN);
     /* 3 digit (octet 3, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_threedig, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_threedig, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* 2 digit (octet 3, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twodig, tvb, offset,   1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twodig, tvb, offset,   1, ENC_BIG_ENDIAN);
     /* 1 digit (octet 3, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_onedig, tvb, offset,   1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_onedig, tvb, offset,   1, ENC_BIG_ENDIAN);
     /* No digits (octet 3, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_nodig, tvb, offset,    1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_nodig, tvb, offset,    1, ENC_BIG_ENDIAN);
     offset++;
 
     /* 15 digit (octet 4, bit H) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fifteendig, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fifteendig, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* 14 digit (octet 4, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fourteendig, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_fourteendig, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* 13 digit (octet 4, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* 12 digit (octet 4, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twelvedig, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twelvedig, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* 11 digit (octet 4, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* 10 digit (octet 4, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_tendig, tvb, offset,   1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_tendig, tvb, offset,   1, ENC_BIG_ENDIAN);
     /* 9 digit (octet 4, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ninedig, tvb, offset,  1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_ninedig, tvb, offset,  1, ENC_BIG_ENDIAN);
     /* 8 digits (octet 4, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_eightdig, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_eightdig, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -3021,7 +3046,7 @@ static const value_string ansi_map_PACA_Level_vals[]  = {
     {   6, "Priority Level 6"},
     {   7, "Priority Level 7"},
     {   8, "Priority Level 8"},
-    {   8, "Priority Level 9"},
+    {   9, "Priority Level 9"},
     {   10, "Priority Level 10"},
     {   11, "Priority Level 11"},
     {   12, "Priority Level 12"},
@@ -3040,9 +3065,9 @@ dissect_ansi_map_pacaindicator(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     subtree = proto_item_add_subtree(actx->created_item, ett_pacaindicator);
     /* PACA Level (octet 1, bits B-E) */
-    proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset,   1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_PACA_Level, tvb, offset,   1, ENC_BIG_ENDIAN);
     /* Permanent Activation (PA) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_pacaindicator_pa, tvb, offset,     1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_pacaindicator_pa, tvb, offset,     1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.92 PageIndicator */
@@ -3064,7 +3089,7 @@ dissect_ansi_map_pc_ssn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* Type (octet 1) */
-    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_msc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* Point Code Member Number octet 2 */
     b1 = tvb_get_guint8(tvb,offset);
@@ -3091,15 +3116,15 @@ dissect_ansi_map_pilotbillingid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 
     subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
     /* First Originating MarketID octet 1 and 2 */
-    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* First Originating Switch Number octet 3*/
-    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     /* ID Number */
-    proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_idno, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset = offset + 3;
-    proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_segcount, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.96 PreferredLanguageIndicator */
@@ -3187,6 +3212,7 @@ static const value_string ansi_map_SMS_CauseCode_vals[]  = {
     {   110, "MS Disconnect"},
     {   0, NULL }
 };
+static value_string_ext ansi_map_SMS_CauseCode_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_SMS_CauseCode_vals);
 
 /* 6.5.2.126 SMS_ChargeIndicator */
 /* SMS Charge Indicator (octet 1) */
@@ -3218,8 +3244,8 @@ static const value_string ansi_map_SMS_NotificationIndicator_vals[]  = {
 static const value_string ansi_map_SMS_OriginationRestrictions_default_vals[]  = {
     {   0, "Block all"},
     {   1, "Reserved"},
-    {   1, "Allow specific"},
-    {   1, "Allow all"},
+    {   2, "Allow specific"},
+    {   3, "Allow all"},
     {   0, NULL }
 };
 /* DIRECT (octet 1, bit C) */
@@ -3242,10 +3268,10 @@ dissect_ansi_map_sms_originationrestrictions(tvbuff_t *tvb, packet_info *pinfo _
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_sms_originationrestrictions);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_fmc, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_direct, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHGFE, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_fmc, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_direct, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_sms_originationrestrictions_default, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -3336,13 +3362,13 @@ dissect_ansi_map_systemcapabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_systemcapabilities);
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_dp, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_ssd, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_cave, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_vp, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_se, tvb, offset, 1, FALSE);
-    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_auth, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitHG, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_dp, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_ssd, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_cave, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_vp, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_se, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(subtree, hf_ansi_map_systemcapabilities_auth, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.151 TDMABurstIndicator */
@@ -3429,19 +3455,19 @@ dissect_ansi_map_terminationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
 
     subtree = proto_item_add_subtree(actx->created_item, ett_transactioncapability);
 
-    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_reservedBitH, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* No Page Response (NPR) (octet 1, bits E and F) */
-    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_npr, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* No Answer (NA) (octet 1, bits G and H) */
-    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_na, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Routing Failure (RF) (octet 1, bits C and D) */
-    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_rf, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Busy (octet 1, bits A and B) */
-    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_busy, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
 
     /* None Reachable (NR) (octet 2, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_terminationtriggers_nr, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.160 TransactionCapability (TIA/EIA-41.5-D, page 5-315) */
@@ -3525,29 +3551,29 @@ dissect_ansi_map_transactioncapability(tvbuff_t *tvb, packet_info *pinfo _U_, pr
     subtree = proto_item_add_subtree(actx->created_item, ett_transactioncapability);
 
     /*NAME Capability Indicator (NAMI) (octet 1, bit H) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_nami, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_nami, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* NDSS Capability (NDSS) (octet 1, bit G) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_ndss, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_ndss, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* UZ Capability Indicator (UZCI) (octet 1, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_uzci, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_uzci, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Subscriber PIN Intercept (SPINI) (octet 1, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_spini, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_spini, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Remote User Interaction (RUI) (octet 1, bit D) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_rui, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_rui, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Announcements (ANN) (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_ann, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_ann, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Busy Detection (BUSY) (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_busy, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_busy, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Profile (PROF) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_prof, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_trans_cap_prof, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
 
     /* WIN Addressing (WADDR) (octet 2, bit F) */
-    proto_tree_add_item(subtree, hf_ansi_trans_cap_waddr, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_trans_cap_waddr, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* TerminationList (TL) (octet 2, bit E) */
-    proto_tree_add_item(subtree, hf_ansi_trans_cap_tl, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_trans_cap_tl, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Multiple Terminations (octet 2, bits A-D) */
-    proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_trans_cap_multerm, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 /* 6.5.2.162 UniqueChallengeReport */
@@ -3674,7 +3700,7 @@ dissect_ansi_map_cdmaserviceoption(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
 
     subtree = proto_item_add_subtree(actx->created_item, ett_cdmaserviceoption);
 
-    proto_tree_add_item(subtree, hf_ansi_map_cdmaserviceoption, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_cdmaserviceoption, tvb, offset, 2, ENC_BIG_ENDIAN);
 
 
 }
@@ -3876,10 +3902,10 @@ static const value_string ansi_map_TDMABandwidth_vals[]  = {
 
    subtree = proto_item_add_subtree(actx->created_item, ett_billingid);
    / Trunk Group Number (G) Octet 1 /
-   proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, FALSE);
+   proto_tree_add_item(subtree, hf_ansi_map_tgn, tvb, offset, 1, ENC_BIG_ENDIAN);
    offset++;
    / Trunk Member Number (M) Octet2 /
-   proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, FALSE);
+   proto_tree_add_item(subtree, hf_ansi_map_tmn, tvb, offset, 1, ENC_BIG_ENDIAN);
    }
 */
 /* 6.5.2.as ChangeServiceAttributes N.S0008-0 v 1.0 */
@@ -4029,54 +4055,54 @@ dissect_ansi_map_triggercapability(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
 
 
     /* O_No_Answer (ONA) (octet 1, bit H)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_ona, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_ona, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* O_Disconnect (ODISC) (octet 1, bit G)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_odisc, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_odisc, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* O_Answer (OANS) (octet 1, bit F)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_oans, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_oans, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* Origination_Attempt_Authorized (OAA) (octet 1, bit E)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_oaa, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_oaa, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* Revertive_Call (RvtC) (octet 1, bit D)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_rvtc, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_rvtc, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* All_Calls (All) (octet 1, bit C)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_all, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_all, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* K-digit (K-digit) (octet 1, bit B)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_kdigit, tvb, offset,     1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_kdigit, tvb, offset,     1, ENC_BIG_ENDIAN);
     /* Introducing Star/Pound (INIT) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_init, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_init, tvb, offset,       1, ENC_BIG_ENDIAN);
     offset++;
 
 
     /* O_Called_Party_Busy (OBSY) (octet 2, bit H)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_obsy, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_obsy, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* Called_Routing_Address_Available (CdRAA) (octet 2, bit G)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_cdraa, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_cdraa, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* Initial_Termination (IT) (octet 2, bit F)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_it, tvb, offset,         1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_it, tvb, offset,         1, ENC_BIG_ENDIAN);
     /* Calling_Routing_Address_Available (CgRAA)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_cgraa, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_cgraa, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* Advanced_Termination (AT) (octet 2, bit D)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_at, tvb, offset,         1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_at, tvb, offset,         1, ENC_BIG_ENDIAN);
     /* Prior_Agreement (PA) (octet 2, bit C)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_pa, tvb, offset,         1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_pa, tvb, offset,         1, ENC_BIG_ENDIAN);
     /* Unrecognized_Number (Unrec) (octet 2, bit B)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_unrec, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_unrec, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* Call Types (CT) (octet 2, bit A)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_ct, tvb, offset,         1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_ct, tvb, offset,         1, ENC_BIG_ENDIAN);
     offset++;
     /* */
     /* */
     /* */
     /* T_Disconnect (TDISC) (octet 3, bit E)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tdisc, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tdisc, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* T_Answer (TANS) (octet 3, bit D)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tans, tvb, offset,       1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tans, tvb, offset,       1, ENC_BIG_ENDIAN);
     /* T_No_Answer (TNA) (octet 3, bit C)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tna, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tna, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* T_Busy (TBusy) (octet 3, bit B)*/
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tbusy, tvb, offset,      1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tbusy, tvb, offset,      1, ENC_BIG_ENDIAN);
     /* Terminating_Resource_Available (TRA) (octet 3, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tra, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_triggercapability_tra, tvb, offset,        1, ENC_BIG_ENDIAN);
 
 }
 /* 6.5.2.ei DMH_ServiceID N.S0018 */
@@ -4109,11 +4135,11 @@ dissect_ansi_map_winoperationscapability(tvbuff_t *tvb, packet_info *pinfo _U_,
     subtree = proto_item_add_subtree(actx->created_item, ett_winoperationscapability);
 
     /* PositionRequest (POS) (octet 1, bit C) */
-    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_pos, tvb, offset,  1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_pos, tvb, offset,  1, ENC_BIG_ENDIAN);
     /* CallControlDirective (CCDIR) (octet 1, bit B) */
-    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_ccdir, tvb, offset,        1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_ccdir, tvb, offset,        1, ENC_BIG_ENDIAN);
     /* ConnectResource (CONN) (octet 1, bit A) */
-    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_conn, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_winoperationscapability_conn, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 }
 /*
@@ -4136,10 +4162,10 @@ dissect_ansi_map_controlnetworkid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 
     subtree = proto_item_add_subtree(actx->created_item, ett_controlnetworkid);
     /* MarketID octet 1 and 2 */
-    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_MarketID, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* Switch Number octet 3*/
-    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, FALSE);
+    proto_tree_add_item(subtree, hf_ansi_map_swno, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
 }
 
@@ -4418,7 +4444,7 @@ static const value_string ansi_map_VoicePrivacyReport_vals[]  = {
 
 
 /*--- Included file: packet-ansi_map-fn.c ---*/
-#line 1 "packet-ansi_map-fn.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-fn.c"
 
 
 static int
@@ -4433,7 +4459,7 @@ dissect_ansi_map_ElectronicSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_ansi_map_MINType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 26 "ansi_map.cnf"
+#line 37 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -4532,7 +4558,7 @@ dissect_ansi_map_CDMAPrivateLongCodeMask(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_ansi_map_DigitsType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 33 "ansi_map.cnf"
+#line 44 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -4642,7 +4668,7 @@ dissect_ansi_map_MobileStationMIN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_MSCID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 190 "ansi_map.cnf"
+#line 201 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -4821,7 +4847,7 @@ dissect_ansi_map_AuthenticationDirectiveRes(gboolean implicit_tag _U_, tvbuff_t
 
 static int
 dissect_ansi_map_InterMSCCircuitID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 165 "ansi_map.cnf"
+#line 176 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -4967,7 +4993,7 @@ dissect_ansi_map_SystemAccessType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_SystemCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 333 "ansi_map.cnf"
+#line 344 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5016,6 +5042,8 @@ static const value_string ansi_map_TerminalType_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext ansi_map_TerminalType_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_TerminalType_vals);
+
 
 static int
 dissect_ansi_map_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -5130,7 +5158,7 @@ dissect_ansi_map_CDMANetworkIdentification(gboolean implicit_tag _U_, tvbuff_t *
 
 static int
 dissect_ansi_map_ConfidentialityModes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 119 "ansi_map.cnf"
+#line 130 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5166,7 +5194,7 @@ dissect_ansi_map_Digits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_ansi_map_PC_SSN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 246 "ansi_map.cnf"
+#line 257 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5221,7 +5249,7 @@ dissect_ansi_map_SuspiciousAccess(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_TransactionCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 350 "ansi_map.cnf"
+#line 361 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5466,7 +5494,7 @@ dissect_ansi_map_ReauthenticationReport(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_ansi_map_ServiceIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 430 "ansi_map.cnf"
+#line 441 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5478,17 +5506,17 @@ 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;
                        }
                }
        }
-        
+
 
 
   return offset;
@@ -5771,7 +5799,7 @@ dissect_ansi_map_CountRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_ansi_map_BillingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 73 "ansi_map.cnf"
+#line 84 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5789,7 +5817,7 @@ dissect_ansi_map_BillingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_ansi_map_ChannelData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 111 "ansi_map.cnf"
+#line 122 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5866,7 +5894,7 @@ dissect_ansi_map_HandoffReason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_ansi_map_HandoffState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 157 "ansi_map.cnf"
+#line 168 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -5991,7 +6019,7 @@ dissect_ansi_map_BaseStationManufacturerCode(gboolean implicit_tag _U_, tvbuff_t
 
 static int
 dissect_ansi_map_AlertCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 48 "ansi_map.cnf"
+#line 59 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6009,7 +6037,7 @@ dissect_ansi_map_AlertCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_ansi_map_CDMA2000HandoffInvokeIOSData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 408 "ansi_map.cnf"
+#line 419 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
     proto_tree *subtree;
 
@@ -6018,7 +6046,7 @@ dissect_ansi_map_CDMA2000HandoffInvokeIOSData(gboolean implicit_tag _U_, tvbuff_
 
        if (parameter_tvb){
                subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffInvokeIOSData);
-               dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree, 
+               dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
                        0, tvb_length_remaining(parameter_tvb,0));
        }
 
@@ -6079,7 +6107,7 @@ dissect_ansi_map_CDMABandClassList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_CDMACallMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 88 "ansi_map.cnf"
+#line 99 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6096,7 +6124,7 @@ dissect_ansi_map_CDMACallMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_ansi_map_CDMAChannelData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 95 "ansi_map.cnf"
+#line 106 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6124,7 +6152,7 @@ dissect_ansi_map_CDMAConnectionReference(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_ansi_map_CDMAServiceOption(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 358 "ansi_map.cnf"
+#line 369 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6262,7 +6290,7 @@ dissect_ansi_map_CDMAServingOneWayDelay(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_ansi_map_CDMAStationClassMark(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 103 "ansi_map.cnf"
+#line 114 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6378,7 +6406,7 @@ dissect_ansi_map_ISLPInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_ansi_map_MSLocation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 198 "ansi_map.cnf"
+#line 209 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6396,7 +6424,7 @@ dissect_ansi_map_MSLocation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ansi_map_NAMPSCallMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 206 "ansi_map.cnf"
+#line 217 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6414,7 +6442,7 @@ dissect_ansi_map_NAMPSCallMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_ansi_map_NAMPSChannelData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 214 "ansi_map.cnf"
+#line 225 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6618,7 +6646,7 @@ dissect_ansi_map_BSMCStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ansi_map_CDMA2000HandoffResponseIOSData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 419 "ansi_map.cnf"
+#line 430 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
     proto_tree *subtree;
 
@@ -6627,7 +6655,7 @@ dissect_ansi_map_CDMA2000HandoffResponseIOSData(gboolean implicit_tag _U_, tvbuf
 
        if (parameter_tvb){
                subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffResponseIOSData);
-               dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree, 
+               dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
                        0, tvb_length_remaining(parameter_tvb,0));
        }
 
@@ -6859,7 +6887,7 @@ dissect_ansi_map_ACGEncountered(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ansi_map_CallingPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 369 "ansi_map.cnf"
+#line 380 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6895,7 +6923,7 @@ dissect_ansi_map_CallingPartyNumberDigits2(gboolean implicit_tag _U_, tvbuff_t *
 
 static int
 dissect_ansi_map_Subaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 40 "ansi_map.cnf"
+#line 51 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -6950,7 +6978,7 @@ dissect_ansi_map_MSCIdentificationNumber(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_ansi_map_OneTimeFeatureIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 222 "ansi_map.cnf"
+#line 233 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -7004,6 +7032,8 @@ static const value_string ansi_map_SystemMyTypeCode_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext ansi_map_SystemMyTypeCode_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_SystemMyTypeCode_vals);
+
 
 static int
 dissect_ansi_map_SystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7113,7 +7143,7 @@ dissect_ansi_map_ActionCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ansi_map_AnnouncementCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 56 "ansi_map.cnf"
+#line 67 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -7237,6 +7267,8 @@ static const value_string ansi_map_DMH_RedirectionIndicator_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext ansi_map_DMH_RedirectionIndicator_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_DMH_RedirectionIndicator_vals);
+
 
 static int
 dissect_ansi_map_DMH_RedirectionIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7270,7 +7302,7 @@ dissect_ansi_map_NoAnswerTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_ansi_map_PACAIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 238 "ansi_map.cnf"
+#line 249 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -7376,7 +7408,7 @@ dissect_ansi_map_LegInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ansi_map_TerminationTriggers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 342 "ansi_map.cnf"
+#line 353 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -7565,7 +7597,7 @@ dissect_ansi_map_DestinationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 static int
 dissect_ansi_map_WIN_TriggerList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 392 "ansi_map.cnf"
+#line 403 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -7787,7 +7819,7 @@ static const ber_sequence_t HandoffBack2_U_set[] = {
   { &hf_ansi_map_cdmaStationClassMark, BER_CLASS_CON, 59, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMAStationClassMark },
   { &hf_ansi_map_cdmaStationClassMark2, BER_CLASS_CON, 177, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMAStationClassMark2 },
   { &hf_ansi_map_cdmaTargetMAHOList, BER_CLASS_CON, 136, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMAHOList },
-  { &hf_ansi_map_cdmaTargetMeasurementList, BER_CLASS_CON, 134, BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMeasurementList },
+  { &hf_ansi_map_cdmaTargetMeasurementList, BER_CLASS_CON, 134, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMeasurementList },
   { &hf_ansi_map_channelData, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ChannelData },
   { &hf_ansi_map_confidentialityModes, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ConfidentialityModes },
   { &hf_ansi_map_dataKey    , BER_CLASS_CON, 215, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DataKey },
@@ -7947,6 +7979,8 @@ static const value_string ansi_map_SignalQuality_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext ansi_map_SignalQuality_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_SignalQuality_vals);
+
 
 static int
 dissect_ansi_map_SignalQuality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -8352,7 +8386,7 @@ dissect_ansi_map_InformationDirectiveRes(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_ansi_map_MessageWaitingNotificationCount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 173 "ansi_map.cnf"
+#line 184 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -8370,7 +8404,7 @@ dissect_ansi_map_MessageWaitingNotificationCount(gboolean implicit_tag _U_, tvbu
 
 static int
 dissect_ansi_map_MessageWaitingNotificationType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 181 "ansi_map.cnf"
+#line 192 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -8487,7 +8521,7 @@ dissect_ansi_map_CDMASlotCycleIndex(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 static int
 dissect_ansi_map_ExtendedMSCID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 142 "ansi_map.cnf"
+#line 153 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -8505,7 +8539,7 @@ dissect_ansi_map_ExtendedMSCID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_ansi_map_ExtendedSystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 150 "ansi_map.cnf"
+#line 161 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -8572,7 +8606,7 @@ dissect_ansi_map_PageResponseTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_PilotBillingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 254 "ansi_map.cnf"
+#line 265 "../../asn1/ansi_map/ansi_map.cnf"
 
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -9039,6 +9073,8 @@ static const value_string ansi_map_TriggerType_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext ansi_map_TriggerType_vals_ext = VALUE_STRING_EXT_INIT(ansi_map_TriggerType_vals);
+
 
 static int
 dissect_ansi_map_TriggerType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -9052,7 +9088,7 @@ dissect_ansi_map_TriggerType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_ansi_map_TriggerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 377 "ansi_map.cnf"
+#line 388 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9070,7 +9106,7 @@ dissect_ansi_map_TriggerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_WINOperationsCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 385 "ansi_map.cnf"
+#line 396 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9156,7 +9192,7 @@ dissect_ansi_map_LocationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_ansi_map_ControlNetworkID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 400 "ansi_map.cnf"
+#line 411 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9310,7 +9346,7 @@ dissect_ansi_map_MSInactive(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ansi_map_OriginationTriggers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 230 "ansi_map.cnf"
+#line 241 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9503,7 +9539,7 @@ dissect_ansi_map_AuthorizationDenied(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 static int
 dissect_ansi_map_AuthorizationPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 64 "ansi_map.cnf"
+#line 75 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9522,7 +9558,7 @@ dissect_ansi_map_AuthorizationPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 static int
 dissect_ansi_map_DeniedAuthorizationPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 134 "ansi_map.cnf"
+#line 145 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9550,7 +9586,7 @@ dissect_ansi_map_AuthenticationCapability(gboolean implicit_tag _U_, tvbuff_t *t
 
 static int
 dissect_ansi_map_CallingFeaturesIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 81 "ansi_map.cnf"
+#line 92 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9583,6 +9619,16 @@ dissect_ansi_map_MEIDValidated(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 }
 
 
+
+static int
+dissect_ansi_map_MobilePositionCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                       NULL);
+
+  return offset;
+}
+
+
 static const value_string ansi_map_OriginationIndicator_vals[] = {
   {   0, "not-used" },
   {   1, "prior-agreement" },
@@ -9618,7 +9664,7 @@ dissect_ansi_map_RestrictionDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_SMS_OriginationRestrictions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 299 "ansi_map.cnf"
+#line 310 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -9736,6 +9782,7 @@ static const ber_sequence_t QualificationDirective_U_set[] = {
   { &hf_ansi_map_messageWaitingNotificationCount, BER_CLASS_CON, 92, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationCount },
   { &hf_ansi_map_messageWaitingNotificationType, BER_CLASS_CON, 145, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationType },
   { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber },
+  { &hf_ansi_map_mobilePositionCapability, BER_CLASS_CON, 335, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobilePositionCapability },
   { &hf_ansi_map_originationIndicator, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationIndicator },
   { &hf_ansi_map_originationTriggers, BER_CLASS_CON, 98, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationTriggers },
   { &hf_ansi_map_pACAIndicator, BER_CLASS_CON, 146, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PACAIndicator },
@@ -9868,6 +9915,7 @@ static const ber_sequence_t QualificationRequestRes_U_set[] = {
   { &hf_ansi_map_messageWaitingNotificationCount, BER_CLASS_CON, 92, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationCount },
   { &hf_ansi_map_messageWaitingNotificationType, BER_CLASS_CON, 145, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationType },
   { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber },
+  { &hf_ansi_map_mobilePositionCapability, BER_CLASS_CON, 335, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobilePositionCapability },
   { &hf_ansi_map_originationIndicator, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationIndicator },
   { &hf_ansi_map_originationTriggers, BER_CLASS_CON, 98, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationTriggers },
   { &hf_ansi_map_pACAIndicator, BER_CLASS_CON, 146, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PACAIndicator },
@@ -10074,7 +10122,7 @@ dissect_ansi_map_CancellationType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_ControlChannelData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 126 "ansi_map.cnf"
+#line 137 "../../asn1/ansi_map/ansi_map.cnf"
        tvbuff_t *parameter_tvb = NULL;
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &parameter_tvb);
@@ -10331,6 +10379,7 @@ static const ber_sequence_t RegistrationNotificationRes_U_set[] = {
   { &hf_ansi_map_messageWaitingNotificationCount, BER_CLASS_CON, 92, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationCount },
   { &hf_ansi_map_messageWaitingNotificationType, BER_CLASS_CON, 145, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationType },
   { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber },
+  { &hf_ansi_map_mobilePositionCapability, BER_CLASS_CON, 335, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobilePositionCapability },
   { &hf_ansi_map_originationIndicator, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationIndicator },
   { &hf_ansi_map_originationTriggers, BER_CLASS_CON, 98, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationTriggers },
   { &hf_ansi_map_pACAIndicator, BER_CLASS_CON, 146, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PACAIndicator },
@@ -10603,7 +10652,7 @@ dissect_ansi_map_RoutingRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_ansi_map_SMS_BearerData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 263 "ansi_map.cnf"
+#line 274 "../../asn1/ansi_map/ansi_map.cnf"
        int length;
     proto_tree *subtree;
        SMS_BearerData_tvb = NULL;
@@ -10622,17 +10671,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;
@@ -10649,7 +10698,7 @@ dissect_ansi_map_SMS_BearerData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ansi_map_SMS_TeleserviceIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 308 "ansi_map.cnf"
+#line 319 "../../asn1/ansi_map/ansi_map.cnf"
 
        int length;
     proto_tree *subtree;
@@ -10670,7 +10719,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);
                }
        }
 
@@ -11221,6 +11270,7 @@ static const ber_sequence_t SMSRequestRes_U_set[] = {
   { &hf_ansi_map_sms_AccessDeniedReason, BER_CLASS_CON, 152, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_SMS_AccessDeniedReason },
   { &hf_ansi_map_sms_Address, BER_CLASS_CON, 104, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_SMS_Address },
   { &hf_ansi_map_sms_CauseCode, BER_CLASS_CON, 153, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_SMS_CauseCode },
+  { &hf_ansi_map_transactionCapability, BER_CLASS_CON, 123, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TransactionCapability },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11734,6 +11784,30 @@ dissect_ansi_map_NumberPortabilityRequest(gboolean implicit_tag _U_, tvbuff_t *t
 }
 
 
+static const ber_sequence_t NumberPortabilityRequestRes_U_set[] = {
+  { &hf_ansi_map_routingDigits, BER_CLASS_CON, 150, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_RoutingDigits },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_ansi_map_NumberPortabilityRequestRes_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
+                              NumberPortabilityRequestRes_U_set, hf_index, ett_ansi_map_NumberPortabilityRequestRes_U);
+
+  return offset;
+}
+
+
+
+static int
+dissect_ansi_map_NumberPortabilityRequestRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
+                                      hf_index, BER_CLASS_PRI, 18, FALSE, dissect_ansi_map_NumberPortabilityRequestRes_U);
+
+  return offset;
+}
+
+
 
 static int
 dissect_ansi_map_ServiceID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -11847,7 +11921,7 @@ dissect_ansi_map_TimeOfDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static const ber_sequence_t ServiceRequest_U_set[] = {
-  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 245, BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
+  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 246, BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
   { &hf_ansi_map_accessDeniedReason, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_AccessDeniedReason },
   { &hf_ansi_map_acgencountered, BER_CLASS_CON, 340, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ACGEncountered },
   { &hf_ansi_map_availabilityType, BER_CLASS_CON, 90, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_AvailabilityType },
@@ -12258,8 +12332,8 @@ dissect_ansi_map_DatabaseKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
 static const ber_sequence_t ServiceDataAccessElement_sequence[] = {
-  { &hf_ansi_map_dataAccessElementList, BER_CLASS_CON, 250, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DataAccessElementList },
-  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 246, BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
+  { &hf_ansi_map_dataAccessElementList, BER_CLASS_CON, 250, BER_FLAGS_IMPLTAG, dissect_ansi_map_DataAccessElementList },
+  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 246, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -12403,8 +12477,8 @@ dissect_ansi_map_DataUpdateResultList(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 
 static const ber_sequence_t ServiceDataResult_sequence[] = {
-  { &hf_ansi_map_dataUpdateResultList, BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DataUpdateResultList },
-  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 246, BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
+  { &hf_ansi_map_dataUpdateResultList, BER_CLASS_CON, 255, BER_FLAGS_IMPLTAG, dissect_ansi_map_DataUpdateResultList },
+  { &hf_ansi_map_serviceID  , BER_CLASS_CON, 246, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ServiceID },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -13821,16 +13895,6 @@ dissect_ansi_map_LCS_Client_ID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 
-static int
-dissect_ansi_map_MobilePositionCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
 static int
 dissect_ansi_map_DTXIndication(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -13853,7 +13917,7 @@ dissect_ansi_map_CDMAMobileCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb
 static const ber_sequence_t CDMAPSMMList_item_set[] = {
   { &hf_ansi_map_cdmaServingOneWayDelay2, BER_CLASS_CON, 347, BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMAServingOneWayDelay2 },
   { &hf_ansi_map_cdmaTargetMAHOList, BER_CLASS_CON, 136, BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMAHOList },
-  { &hf_ansi_map_cdmaTargetMAHOList2, BER_CLASS_CON, 136, BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMAHOList },
+  { &hf_ansi_map_cdmaTargetMAHOList2, BER_CLASS_CON, 136, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMATargetMAHOList },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -14142,7 +14206,7 @@ static const ber_sequence_t InterSystemPositionRequest_U_set[] = {
   { &hf_ansi_map_pqos_VerticalPosition, BER_CLASS_CON, 377, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PQOS_VerticalPosition },
   { &hf_ansi_map_pqos_VerticalVelocity, BER_CLASS_CON, 378, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PQOS_VerticalVelocity },
   { &hf_ansi_map_servingCellID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ServingCellID },
-  { &hf_ansi_map_tdma_MAHORequest, BER_CLASS_CON, 364, BER_FLAGS_IMPLTAG, dissect_ansi_map_TDMA_MAHORequest },
+  { &hf_ansi_map_tdma_MAHORequest, BER_CLASS_CON, 364, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TDMA_MAHORequest },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -14308,7 +14372,7 @@ static const ber_sequence_t InterSystemPositionRequestForward_U_set[] = {
   { &hf_ansi_map_pqos_ResponseTime, BER_CLASS_CON, 376, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PQOS_ResponseTime },
   { &hf_ansi_map_pqos_VerticalPosition, BER_CLASS_CON, 377, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PQOS_VerticalPosition },
   { &hf_ansi_map_pqos_VerticalVelocity, BER_CLASS_CON, 378, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PQOS_VerticalVelocity },
-  { &hf_ansi_map_tdma_MAHORequest, BER_CLASS_CON, 364, BER_FLAGS_IMPLTAG, dissect_ansi_map_TDMA_MAHORequest },
+  { &hf_ansi_map_tdma_MAHORequest, BER_CLASS_CON, 364, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TDMA_MAHORequest },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -15194,6 +15258,7 @@ static const ber_sequence_t QualificationRequest2Res_U_set[] = {
   { &hf_ansi_map_messageWaitingNotificationCount, BER_CLASS_CON, 92, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationCount },
   { &hf_ansi_map_messageWaitingNotificationType, BER_CLASS_CON, 145, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MessageWaitingNotificationType },
   { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber },
+  { &hf_ansi_map_mobilePositionCapability, BER_CLASS_CON, 335, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobilePositionCapability },
   { &hf_ansi_map_originationIndicator, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationIndicator },
   { &hf_ansi_map_originationTriggers, BER_CLASS_CON, 98, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OriginationTriggers },
   { &hf_ansi_map_pACAIndicator, BER_CLASS_CON, 146, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PACAIndicator },
@@ -15430,6 +15495,7 @@ static const ber_sequence_t ReturnData_sequence[] = {
   { &hf_ansi_map_changeServiceRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_ChangeServiceRes },
   { &hf_ansi_map_parameterRequestRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_ParameterRequestRes },
   { &hf_ansi_map_tMSIDirectiveRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_TMSIDirectiveRes },
+  { &hf_ansi_map_numberPortabilityRequestRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_NumberPortabilityRequestRes },
   { &hf_ansi_map_serviceRequestRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_ServiceRequestRes },
   { &hf_ansi_map_analyzedInformationRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_AnalyzedInformationRes },
   { &hf_ansi_map_facilitySelectedAndAvailableRes, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_FacilitySelectedAndAvailableRes },
@@ -15470,7 +15536,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 
 /*--- End of included file: packet-ansi_map-fn.c ---*/
-#line 3634 "packet-ansi_map-template.c"
+#line 3658 "../../asn1/ansi_map/packet-ansi_map-template.c"
 
 /*
  * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301
@@ -15507,7 +15573,7 @@ dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
             j=0;
             break;
         default:
-            proto_tree_add_text(subtree, tvb, offset, 1, "[%u] (%u) %s",j,octet,val_to_str(octet, ansi_map_TriggerType_vals, "Unknown TriggerType (%u)"));
+            proto_tree_add_text(subtree, tvb, offset, 1, "[%u] (%u) %s",j,octet,val_to_str_ext(octet, &ansi_map_TriggerType_vals_ext, "Unknown TriggerType (%u)"));
             j++;
             break;
         }
@@ -16041,6 +16107,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case  56: /*OTASP Request 6.4.2.CC*/
         offset = dissect_ansi_map_OTASPRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_oTASPRequestRes);
         break;
+       /* 57 Information Backward*/
     case  58: /*Change Facilities*/
         offset = dissect_ansi_map_ChangeFacilitiesRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_changeFacilitiesRes);
         break;
@@ -16053,6 +16120,9 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case  61: /*TMSI Directive*/
         offset = dissect_ansi_map_TMSIDirectiveRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_tMSIDirectiveRes);
         break;
+    case  62: /*NumberPortabilityRequest */
+        offset = dissect_ansi_map_NumberPortabilityRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_numberPortabilityRequestRes);
+               break;
     case  63: /*Service Request*/
         offset = dissect_ansi_map_ServiceRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_serviceRequestRes);
         break;
@@ -16060,9 +16130,13 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case  64: /*Analyzed Information Request*/
         offset = dissect_ansi_map_AnalyzedInformationRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_analyzedInformationRes);
         break;
+    /* 65 Connection Failure Report*/
+    /* 66 Connect Resource*/
+    /* 67 Disconnect Resource*/
     case  68: /*Facility Selected and Available*/
         offset = dissect_ansi_map_FacilitySelectedAndAvailableRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_facilitySelectedAndAvailableRes);
         break;
+       /* 69 Instruction Request*/
     case  70: /*Modify*/
         offset = dissect_ansi_map_ModifyRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_modifyRes);
         break;
@@ -16182,10 +16256,19 @@ find_saved_invokedata(asn1_ctx_t *actx){
         src_str = ep_address_to_str(src);
         dst_str = ep_address_to_str(dst);
         /* Reverse order to invoke */
-        g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str);
-        /*
-          g_warning("Find Hash string %s",buf);
-        */
+               switch(ansi_map_response_matching_type){
+                       case ANSI_MAP_TID_ONLY:
+                               g_snprintf(buf,1024,"%s",p_private_tcap->TransactionID_str);
+                               break;
+                       case 1:
+                               g_snprintf(buf,1024,"%s%s",p_private_tcap->TransactionID_str,dst_str);
+                               break;
+                       default:
+                               g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str);
+                               break;
+               }
+
+               /*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->fd->num);*/
         ansi_map_saved_invokedata = g_hash_table_lookup(TransactionId_table, buf);
         if(ansi_map_saved_invokedata){
             OperationCode = ansi_map_saved_invokedata->opcode & 0xff;
@@ -16194,6 +16277,7 @@ find_saved_invokedata(asn1_ctx_t *actx){
             OperationCode = OperationCode & 0x00ff;
         }
     }else{
+               /*g_warning("No private data pkt: %u",actx->pinfo->fd->num);*/
         OperationCode = OperationCode & 0x00ff;
     }
     return OperationCode;
@@ -16227,7 +16311,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /*
      * create the ansi_map protocol tree
      */
-    ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, FALSE);
+    ansi_map_item = proto_tree_add_item(tree, proto_ansi_map, tvb, 0, -1, ENC_NA);
     ansi_map_tree = proto_item_add_subtree(ansi_map_item, ett_ansi_map);
     ansi_map_is_invoke = FALSE;
     is683_ota = FALSE;
@@ -16246,26 +16330,22 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     case 1:
         OperationCode = p_private_tcap->d.OperationCode_private & 0x00ff;
         ansi_map_is_invoke = TRUE;
-       col_clear(pinfo->cinfo, COL_INFO);
-       col_add_fstr(pinfo->cinfo, COL_INFO,"%s Invoke ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
-        proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
+        col_add_fstr(pinfo->cinfo, COL_INFO,"%s Invoke ", val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
+        proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
         offset = dissect_invokeData(ansi_map_tree, tvb, 0, &asn1_ctx);
         update_saved_invokedata(pinfo, ansi_map_tree, tvb);
         break;
     case 2:
         OperationCode = find_saved_invokedata(&asn1_ctx);
-       col_clear(pinfo->cinfo, COL_INFO);
-       col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnResult ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
-        proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
+        col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnResult ", val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
+        proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
         offset = dissect_returnData(ansi_map_tree, tvb, 0, &asn1_ctx);
         break;
     case 3:
-       col_clear(pinfo->cinfo, COL_INFO);
-       col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnError ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
+        col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnError ", val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
         break;
     case 4:
-       col_clear(pinfo->cinfo, COL_INFO);
-       col_add_fstr(pinfo->cinfo, COL_INFO,"%s Reject ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
+        col_add_fstr(pinfo->cinfo, COL_INFO,"%s Reject ", val_to_str_ext(OperationCode, &ansi_map_opr_code_strings_ext, "Unknown ANSI-MAP PDU (%u)"));
         break;
     default:
         /* Must be Invoke ReturnResult ReturnError or Reject */
@@ -16348,7 +16428,7 @@ void proto_register_ansi_map(void) {
             NULL, HFILL }},
         { &hf_ansi_map_op_code,
           { "Operation Code", "ansi_map.op_code",
-            FT_UINT8, BASE_DEC, VALS(ansi_map_opr_code_strings), 0x0,
+            FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ansi_map_opr_code_strings_ext, 0x0,
             NULL, HFILL }},
         { &hf_ansi_map_type_of_digits,
           { "Type of Digits", "ansi_map.type_of_digits",
@@ -17117,2194 +17197,2198 @@ void proto_register_ansi_map(void) {
 
 
 /*--- Included file: packet-ansi_map-hfarr.c ---*/
-#line 1 "packet-ansi_map-hfarr.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-hfarr.c"
     { &hf_ansi_map_electronicSerialNumber,
       { "electronicSerialNumber", "ansi_map.electronicSerialNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ElectronicSerialNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_msid,
       { "msid", "ansi_map.msid",
         FT_UINT32, BASE_DEC, VALS(ansi_map_MSID_vals), 0,
-        "ansi_map.MSID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationAlgorithmVersion,
       { "authenticationAlgorithmVersion", "ansi_map.authenticationAlgorithmVersion",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationAlgorithmVersion", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationResponseReauthentication,
       { "authenticationResponseReauthentication", "ansi_map.authenticationResponseReauthentication",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationResponseReauthentication", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationResponseUniqueChallenge,
       { "authenticationResponseUniqueChallenge", "ansi_map.authenticationResponseUniqueChallenge",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationResponseUniqueChallenge", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callHistoryCount,
       { "callHistoryCount", "ansi_map.callHistoryCount",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CallHistoryCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaPrivateLongCodeMask,
       { "cdmaPrivateLongCodeMask", "ansi_map.cdmaPrivateLongCodeMask",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPrivateLongCodeMask", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_carrierDigits,
       { "carrierDigits", "ansi_map.carrierDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CarrierDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_caveKey,
       { "caveKey", "ansi_map.caveKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CaveKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_denyAccess,
       { "denyAccess", "ansi_map.denyAccess",
         FT_UINT32, BASE_DEC, VALS(ansi_map_DenyAccess_vals), 0,
-        "ansi_map.DenyAccess", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_destinationDigits,
       { "destinationDigits", "ansi_map.destinationDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DestinationDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_locationAreaID,
       { "locationAreaID", "ansi_map.locationAreaID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.LocationAreaID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableReauthentication,
       { "randomVariableReauthentication", "ansi_map.randomVariableReauthentication",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableReauthentication", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_meid,
       { "meid", "ansi_map.meid",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MEID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mobileStationMIN,
       { "mobileStationMIN", "ansi_map.mobileStationMIN",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MobileStationMIN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mscid,
       { "mscid", "ansi_map.mscid",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MSCID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableSSD,
       { "randomVariableSSD", "ansi_map.randomVariableSSD",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableSSD", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableUniqueChallenge,
       { "randomVariableUniqueChallenge", "ansi_map.randomVariableUniqueChallenge",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableUniqueChallenge", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_routingDigits,
       { "routingDigits", "ansi_map.routingDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RoutingDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_senderIdentificationNumber,
       { "senderIdentificationNumber", "ansi_map.senderIdentificationNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SenderIdentificationNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sharedSecretData,
       { "sharedSecretData", "ansi_map.sharedSecretData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SharedSecretData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_signalingMessageEncryptionKey,
       { "signalingMessageEncryptionKey", "ansi_map.signalingMessageEncryptionKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SignalingMessageEncryptionKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ssdnotShared,
       { "ssdnotShared", "ansi_map.ssdnotShared",
         FT_UINT32, BASE_DEC, VALS(ansi_map_SSDNotShared_vals), 0,
-        "ansi_map.SSDNotShared", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_updateCount,
       { "updateCount", "ansi_map.updateCount",
         FT_UINT32, BASE_DEC, VALS(ansi_map_UpdateCount_vals), 0,
-        "ansi_map.UpdateCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interMSCCircuitID,
       { "interMSCCircuitID", "ansi_map.interMSCCircuitID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterMSCCircuitID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mobileIdentificationNumber,
       { "mobileIdentificationNumber", "ansi_map.mobileIdentificationNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MobileIdentificationNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_countUpdateReport,
       { "countUpdateReport", "ansi_map.countUpdateReport",
         FT_UINT8, BASE_DEC, VALS(ansi_map_CountUpdateReport_vals), 0,
-        "ansi_map.CountUpdateReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_uniqueChallengeReport,
       { "uniqueChallengeReport", "ansi_map.uniqueChallengeReport",
         FT_UINT8, BASE_DEC, VALS(ansi_map_UniqueChallengeReport_vals), 0,
-        "ansi_map.UniqueChallengeReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_reportType,
       { "reportType", "ansi_map.reportType",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ReportType_vals), 0,
-        "ansi_map.ReportType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_systemAccessType,
       { "systemAccessType", "ansi_map.systemAccessType",
         FT_UINT32, BASE_DEC, VALS(ansi_map_SystemAccessType_vals), 0,
-        "ansi_map.SystemAccessType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_systemCapabilities,
       { "systemCapabilities", "ansi_map.systemCapabilities",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SystemCapabilities", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callHistoryCountExpected,
       { "callHistoryCountExpected", "ansi_map.callHistoryCountExpected",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CallHistoryCountExpected", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_reportType2,
       { "reportType2", "ansi_map.reportType2",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ReportType_vals), 0,
-        "ansi_map.ReportType", HFILL }},
+        "ReportType", HFILL }},
     { &hf_ansi_map_terminalType,
       { "terminalType", "ansi_map.terminalType",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_TerminalType_vals), 0,
-        "ansi_map.TerminalType", HFILL }},
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_TerminalType_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationData,
       { "authenticationData", "ansi_map.authenticationData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationResponse,
       { "authenticationResponse", "ansi_map.authenticationResponse",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationResponse", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaNetworkIdentification,
       { "cdmaNetworkIdentification", "ansi_map.cdmaNetworkIdentification",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMANetworkIdentification", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_confidentialityModes,
       { "confidentialityModes", "ansi_map.confidentialityModes",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ConfidentialityModes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_controlChannelMode,
       { "controlChannelMode", "ansi_map.controlChannelMode",
         FT_UINT8, BASE_DEC, VALS(ansi_map_ControlChannelMode_vals), 0,
-        "ansi_map.ControlChannelMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_digits,
       { "digits", "ansi_map.digits",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Digits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pc_ssn,
       { "pc-ssn", "ansi_map.pc_ssn",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PC_SSN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariable,
       { "randomVariable", "ansi_map.randomVariable",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariable", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceRedirectionCause,
       { "serviceRedirectionCause", "ansi_map.serviceRedirectionCause",
         FT_UINT8, BASE_DEC, VALS(ansi_map_ServiceRedirectionCause_type_vals), 0,
-        "ansi_map.ServiceRedirectionCause", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_suspiciousAccess,
       { "suspiciousAccess", "ansi_map.suspiciousAccess",
         FT_UINT32, BASE_DEC, VALS(ansi_map_SuspiciousAccess_vals), 0,
-        "ansi_map.SuspiciousAccess", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_transactionCapability,
       { "transactionCapability", "ansi_map.transactionCapability",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TransactionCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_analogRedirectRecord,
       { "analogRedirectRecord", "ansi_map.analogRedirectRecord",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AnalogRedirectRecord", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaRedirectRecord,
       { "cdmaRedirectRecord", "ansi_map.cdmaRedirectRecord",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMARedirectRecord", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataKey,
       { "dataKey", "ansi_map.dataKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DataKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_roamingIndication,
       { "roamingIndication", "ansi_map.roamingIndication",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RoamingIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceRedirectionInfo,
       { "serviceRedirectionInfo", "ansi_map.serviceRedirectionInfo",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceRedirectionInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_voicePrivacyMask,
       { "voicePrivacyMask", "ansi_map.voicePrivacyMask",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.VoicePrivacyMask", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_reauthenticationReport,
       { "reauthenticationReport", "ansi_map.reauthenticationReport",
         FT_UINT8, BASE_DEC, VALS(ansi_map_ReauthenticationReport_vals), 0,
-        "ansi_map.ReauthenticationReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceIndicator,
       { "serviceIndicator", "ansi_map.serviceIndicator",
         FT_UINT8, BASE_DEC, VALS(ansi_map_ServiceIndicator_vals), 0,
-        "ansi_map.ServiceIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_signalingMessageEncryptionReport,
       { "signalingMessageEncryptionReport", "ansi_map.signalingMessageEncryptionReport",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SMEReport_vals), 0,
-        "ansi_map.SignalingMessageEncryptionReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ssdUpdateReport,
       { "ssdUpdateReport", "ansi_map.ssdUpdateReport",
         FT_UINT16, BASE_DEC, VALS(ansi_map_SSDUpdateReport_vals), 0,
-        "ansi_map.SSDUpdateReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_voicePrivacyReport,
       { "voicePrivacyReport", "ansi_map.voicePrivacyReport",
         FT_UINT8, BASE_DEC, VALS(ansi_map_VoicePrivacyReport_vals), 0,
-        "ansi_map.VoicePrivacyReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableBaseStation,
       { "randomVariableBaseStation", "ansi_map.randomVariableBaseStation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableBaseStation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationResponseBaseStation,
       { "authenticationResponseBaseStation", "ansi_map.authenticationResponseBaseStation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationResponseBaseStation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_billingID,
       { "billingID", "ansi_map.billingID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.BillingID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_channelData,
       { "channelData", "ansi_map.channelData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ChannelData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSwitchCount,
       { "interSwitchCount", "ansi_map.interSwitchCount",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.InterSwitchCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_servingCellID,
       { "servingCellID", "ansi_map.servingCellID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ServingCellID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_stationClassMark,
       { "stationClassMark", "ansi_map.stationClassMark",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.StationClassMark", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_targetCellID,
       { "targetCellID", "ansi_map.targetCellID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TargetCellID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffReason,
       { "handoffReason", "ansi_map.handoffReason",
         FT_UINT32, BASE_DEC, VALS(ansi_map_HandoffReason_vals), 0,
-        "ansi_map.HandoffReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffState,
       { "handoffState", "ansi_map.handoffState",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffState", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaBurstIndicator,
       { "tdmaBurstIndicator", "ansi_map.tdmaBurstIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMABurstIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaCallMode,
       { "tdmaCallMode", "ansi_map.tdmaCallMode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMACallMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaChannelData,
       { "tdmaChannelData", "ansi_map.tdmaChannelData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMAChannelData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_baseStationManufacturerCode,
       { "baseStationManufacturerCode", "ansi_map.baseStationManufacturerCode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.BaseStationManufacturerCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_alertCode,
       { "alertCode", "ansi_map.alertCode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AlertCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdma2000HandoffInvokeIOSData,
       { "cdma2000HandoffInvokeIOSData", "ansi_map.cdma2000HandoffInvokeIOSData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMA2000HandoffInvokeIOSData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaBandClassList,
       { "cdmaBandClassList", "ansi_map.cdmaBandClassList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMABandClassList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaCallMode,
       { "cdmaCallMode", "ansi_map.cdmaCallMode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMACallMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaChannelData,
       { "cdmaChannelData", "ansi_map.cdmaChannelData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAChannelData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceList,
       { "cdmaConnectionReferenceList", "ansi_map.cdmaConnectionReferenceList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMAConnectionReferenceList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaMobileProtocolRevision,
       { "cdmaMobileProtocolRevision", "ansi_map.cdmaMobileProtocolRevision",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAMobileProtocolRevision", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaMSMeasuredChannelIdentity,
       { "cdmaMSMeasuredChannelIdentity", "ansi_map.cdmaMSMeasuredChannelIdentity",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAMSMeasuredChannelIdentity", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServiceConfigurationRecord,
       { "cdmaServiceConfigurationRecord", "ansi_map.cdmaServiceConfigurationRecord",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServiceConfigurationRecord", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServiceOptionList,
       { "cdmaServiceOptionList", "ansi_map.cdmaServiceOptionList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMAServiceOptionList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServingOneWayDelay,
       { "cdmaServingOneWayDelay", "ansi_map.cdmaServingOneWayDelay",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServingOneWayDelay", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaStationClassMark,
       { "cdmaStationClassMark", "ansi_map.cdmaStationClassMark",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAStationClassMark", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaStationClassMark2,
       { "cdmaStationClassMark2", "ansi_map.cdmaStationClassMark2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAStationClassMark2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaTargetMAHOList,
       { "cdmaTargetMAHOList", "ansi_map.cdmaTargetMAHOList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMATargetMAHOList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaTargetMeasurementList,
       { "cdmaTargetMeasurementList", "ansi_map.cdmaTargetMeasurementList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMATargetMeasurementList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataPrivacyParameters,
       { "dataPrivacyParameters", "ansi_map.dataPrivacyParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DataPrivacyParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ilspInformation,
       { "ilspInformation", "ansi_map.ilspInformation",
         FT_UINT8, BASE_DEC, VALS(ansi_map_islp_type_vals), 0,
-        "ansi_map.ISLPInformation", HFILL }},
+        "ISLPInformation", HFILL }},
     { &hf_ansi_map_msLocation,
       { "msLocation", "ansi_map.msLocation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MSLocation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_nampsCallMode,
       { "nampsCallMode", "ansi_map.nampsCallMode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NAMPSCallMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_nampsChannelData,
       { "nampsChannelData", "ansi_map.nampsChannelData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NAMPSChannelData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_nonPublicData,
       { "nonPublicData", "ansi_map.nonPublicData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NonPublicData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pdsnAddress,
       { "pdsnAddress", "ansi_map.pdsnAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PDSNAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pdsnProtocolType,
       { "pdsnProtocolType", "ansi_map.pdsnProtocolType",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PDSNProtocolType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qosPriority,
       { "qosPriority", "ansi_map.qosPriority",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.QoSPriority", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_systemOperatorCode,
       { "systemOperatorCode", "ansi_map.systemOperatorCode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SystemOperatorCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaBandwidth,
       { "tdmaBandwidth", "ansi_map.tdmaBandwidth",
         FT_UINT8, BASE_DEC, VALS(ansi_map_TDMABandwidth_vals), 0x0f,
-        "ansi_map.TDMABandwidth", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaServiceCode,
       { "tdmaServiceCode", "ansi_map.tdmaServiceCode",
         FT_UINT8, BASE_DEC, VALS(ansi_map_TDMAServiceCode_vals), 0,
-        "ansi_map.TDMAServiceCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaTerminalCapability,
       { "tdmaTerminalCapability", "ansi_map.tdmaTerminalCapability",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMATerminalCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaVoiceCoder,
       { "tdmaVoiceCoder", "ansi_map.tdmaVoiceCoder",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMAVoiceCoder", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_userZoneData,
       { "userZoneData", "ansi_map.userZoneData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.UserZoneData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_bsmcstatus,
       { "bsmcstatus", "ansi_map.bsmcstatus",
         FT_UINT8, BASE_DEC, VALS(ansi_map_BSMCStatus_vals), 0x03,
-        "ansi_map.BSMCStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdma2000HandoffResponseIOSData,
       { "cdma2000HandoffResponseIOSData", "ansi_map.cdma2000HandoffResponseIOSData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMA2000HandoffResponseIOSData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaCodeChannelList,
       { "cdmaCodeChannelList", "ansi_map.cdmaCodeChannelList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMACodeChannelList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaSearchParameters,
       { "cdmaSearchParameters", "ansi_map.cdmaSearchParameters",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMASearchParameters", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaSearchWindow,
       { "cdmaSearchWindow", "ansi_map.cdmaSearchWindow",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMASearchWindow", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sOCStatus,
       { "sOCStatus", "ansi_map.sOCStatus",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SOCStatus_vals), 0x03,
-        "ansi_map.SOCStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_releaseReason,
       { "releaseReason", "ansi_map.releaseReason",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ReleaseReason_vals), 0,
-        "ansi_map.ReleaseReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_acgencountered,
       { "acgencountered", "ansi_map.acgencountered",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ACGEncountered", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyName,
       { "callingPartyName", "ansi_map.callingPartyName",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyName", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberDigits1,
       { "callingPartyNumberDigits1", "ansi_map.callingPartyNumberDigits1",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyNumberDigits1", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberDigits2,
       { "callingPartyNumberDigits2", "ansi_map.callingPartyNumberDigits2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyNumberDigits2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartySubaddress,
       { "callingPartySubaddress", "ansi_map.callingPartySubaddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartySubaddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_conferenceCallingIndicator,
       { "conferenceCallingIndicator", "ansi_map.conferenceCallingIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ConferenceCallingIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mobileDirectoryNumber,
       { "mobileDirectoryNumber", "ansi_map.mobileDirectoryNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MobileDirectoryNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mSCIdentificationNumber,
       { "mSCIdentificationNumber", "ansi_map.mSCIdentificationNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MSCIdentificationNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oneTimeFeatureIndicator,
       { "oneTimeFeatureIndicator", "ansi_map.oneTimeFeatureIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.OneTimeFeatureIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_systemMyTypeCode,
       { "systemMyTypeCode", "ansi_map.systemMyTypeCode",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_SystemMyTypeCode_vals), 0,
-        "ansi_map.SystemMyTypeCode", HFILL }},
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_SystemMyTypeCode_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_featureResult,
       { "featureResult", "ansi_map.featureResult",
         FT_UINT32, BASE_DEC, VALS(ansi_map_FeatureResult_vals), 0,
-        "ansi_map.FeatureResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_accessDeniedReason,
       { "accessDeniedReason", "ansi_map.accessDeniedReason",
         FT_UINT32, BASE_DEC, VALS(ansi_map_AccessDeniedReason_vals), 0,
-        "ansi_map.AccessDeniedReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_actionCode,
       { "actionCode", "ansi_map.actionCode",
-        FT_UINT8, BASE_DEC, VALS(ansi_map_ActionCode_vals), 0,
-        "ansi_map.ActionCode", HFILL }},
+        FT_UINT8, BASE_DEC|BASE_EXT_STRING|BASE_EXT_STRING, &ansi_map_ActionCode_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_announcementList,
       { "announcementList", "ansi_map.announcementList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AnnouncementList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberString1,
       { "callingPartyNumberString1", "ansi_map.callingPartyNumberString1",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyNumberString1", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberString2,
       { "callingPartyNumberString2", "ansi_map.callingPartyNumberString2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyNumberString2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_digits_Destination,
       { "digits-Destination", "ansi_map.digits_Destination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Digits", HFILL }},
+        "Digits", HFILL }},
     { &hf_ansi_map_displayText,
       { "displayText", "ansi_map.displayText",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DisplayText", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_displayText2,
       { "displayText2", "ansi_map.displayText2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DisplayText2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmh_AccountCodeDigits,
       { "dmh-AccountCodeDigits", "ansi_map.dmh_AccountCodeDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DMH_AccountCodeDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmh_AlternateBillingDigits,
       { "dmh-AlternateBillingDigits", "ansi_map.dmh_AlternateBillingDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DMH_AlternateBillingDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmh_BillingDigits,
       { "dmh-BillingDigits", "ansi_map.dmh_BillingDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DMH_BillingDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmh_RedirectionIndicator,
       { "dmh-RedirectionIndicator", "ansi_map.dmh_RedirectionIndicator",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_DMH_RedirectionIndicator_vals), 0,
-        "ansi_map.DMH_RedirectionIndicator", HFILL }},
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_DMH_RedirectionIndicator_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_groupInformation,
       { "groupInformation", "ansi_map.groupInformation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.GroupInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_noAnswerTime,
       { "noAnswerTime", "ansi_map.noAnswerTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NoAnswerTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pACAIndicator,
       { "pACAIndicator", "ansi_map.pACAIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PACAIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pilotNumber,
       { "pilotNumber", "ansi_map.pilotNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PilotNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_preferredLanguageIndicator,
       { "preferredLanguageIndicator", "ansi_map.preferredLanguageIndicator",
         FT_UINT8, BASE_DEC, VALS(ansi_map_PreferredLanguageIndicator_vals), 0,
-        "ansi_map.PreferredLanguageIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectingNumberDigits,
       { "redirectingNumberDigits", "ansi_map.redirectingNumberDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectingNumberDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectingNumberString,
       { "redirectingNumberString", "ansi_map.redirectingNumberString",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectingNumberString", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectingSubaddress,
       { "redirectingSubaddress", "ansi_map.redirectingSubaddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectingSubaddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_resumePIC,
       { "resumePIC", "ansi_map.resumePIC",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ResumePIC_vals), 0,
-        "ansi_map.ResumePIC", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_terminationList,
       { "terminationList", "ansi_map.terminationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.TerminationList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_terminationTriggers,
       { "terminationTriggers", "ansi_map.terminationTriggers",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TerminationTriggers", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_triggerAddressList,
       { "triggerAddressList", "ansi_map.triggerAddressList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TriggerAddressList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_emergencyServicesRoutingDigits,
       { "emergencyServicesRoutingDigits", "ansi_map.emergencyServicesRoutingDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.EmergencyServicesRoutingDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_targetCellIDList,
       { "targetCellIDList", "ansi_map.targetCellIDList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TargetCellIDList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_signalQuality,
       { "signalQuality", "ansi_map.signalQuality",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_SignalQuality_vals), 0,
-        "ansi_map.SignalQuality", HFILL }},
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_SignalQuality_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_targetMeasurementList,
       { "targetMeasurementList", "ansi_map.targetMeasurementList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.TargetMeasurementList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_alertResult,
       { "alertResult", "ansi_map.alertResult",
         FT_UINT8, BASE_DEC, VALS(ansi_map_AlertResult_result_vals), 0,
-        "ansi_map.AlertResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_messageWaitingNotificationCount,
       { "messageWaitingNotificationCount", "ansi_map.messageWaitingNotificationCount",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MessageWaitingNotificationCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_messageWaitingNotificationType,
       { "messageWaitingNotificationType", "ansi_map.messageWaitingNotificationType",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MessageWaitingNotificationType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaBandClass,
       { "cdmaBandClass", "ansi_map.cdmaBandClass",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMABandClass", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServiceOption,
       { "cdmaServiceOption", "ansi_map.cdmaServiceOption",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServiceOption", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaSlotCycleIndex,
       { "cdmaSlotCycleIndex", "ansi_map.cdmaSlotCycleIndex",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMASlotCycleIndex", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_extendedMSCID,
       { "extendedMSCID", "ansi_map.extendedMSCID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ExtendedMSCID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_extendedSystemMyTypeCode,
       { "extendedSystemMyTypeCode", "ansi_map.extendedSystemMyTypeCode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ExtendedSystemMyTypeCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_imsi,
       { "imsi", "ansi_map.imsi",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "gsm_map.IMSI", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_legInformation,
       { "legInformation", "ansi_map.legInformation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.LegInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mSIDUsage,
       { "mSIDUsage", "ansi_map.mSIDUsage",
         FT_UINT8, BASE_DEC, VALS(ansi_MSIDUsage_m_or_i_vals), 0x03,
-        "ansi_map.MSIDUsage", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_networkTMSI,
       { "networkTMSI", "ansi_map.networkTMSI",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NetworkTMSI", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pageCount,
       { "pageCount", "ansi_map.pageCount",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PageCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pageIndicator,
       { "pageIndicator", "ansi_map.pageIndicator",
         FT_UINT8, BASE_DEC, VALS(ansi_map_PageIndicator_vals), 0,
-        "ansi_map.PageIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pageResponseTime,
       { "pageResponseTime", "ansi_map.pageResponseTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PageResponseTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pilotBillingID,
       { "pilotBillingID", "ansi_map.pilotBillingID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PilotBillingID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectingPartyName,
       { "redirectingPartyName", "ansi_map.redirectingPartyName",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectingPartyName", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaDataFeaturesIndicator,
       { "tdmaDataFeaturesIndicator", "ansi_map.tdmaDataFeaturesIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMADataFeaturesIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_terminationTreatment,
       { "terminationTreatment", "ansi_map.terminationTreatment",
         FT_UINT8, BASE_DEC, VALS(ansi_map_TerminationTreatment_vals), 0,
-        "ansi_map.TerminationTreatment", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_conditionallyDeniedReason,
       { "conditionallyDeniedReason", "ansi_map.conditionallyDeniedReason",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ConditionallyDeniedReason_vals), 0,
-        "ansi_map.ConditionallyDeniedReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pagingFrameClass,
       { "pagingFrameClass", "ansi_map.pagingFrameClass",
         FT_UINT8, BASE_DEC, VALS(ansi_map_PagingFrameClass_vals), 0x03,
-        "ansi_map.PagingFrameClass", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pSID_RSIDList,
       { "pSID-RSIDList", "ansi_map.pSID_RSIDList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PSID_RSIDList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randc,
       { "randc", "ansi_map.randc",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RANDC", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaDataMode,
       { "tdmaDataMode", "ansi_map.tdmaDataMode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMADataMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_changeServiceAttributes,
       { "changeServiceAttributes", "ansi_map.changeServiceAttributes",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ChangeServiceAttributes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_edirectingSubaddress,
       { "edirectingSubaddress", "ansi_map.edirectingSubaddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectingSubaddress", HFILL }},
+        "RedirectingSubaddress", HFILL }},
     { &hf_ansi_map_setupResult,
       { "setupResult", "ansi_map.setupResult",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SetupResult_vals), 0,
-        "ansi_map.SetupResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_terminationAccessType,
       { "terminationAccessType", "ansi_map.terminationAccessType",
         FT_UINT8, BASE_DEC, VALS(ansi_map_TerminationAccessType_vals), 0,
-        "ansi_map.TerminationAccessType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_triggerType,
       { "triggerType", "ansi_map.triggerType",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_TriggerType_vals), 0,
-        "ansi_map.TriggerType", HFILL }},
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_TriggerType_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_winCapability,
       { "winCapability", "ansi_map.winCapability",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.WINCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingPartyCategory,
       { "callingPartyCategory", "ansi_map.callingPartyCategory",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingPartyCategory", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_controlNetworkID,
       { "controlNetworkID", "ansi_map.controlNetworkID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ControlNetworkID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_digits_carrier,
       { "digits-carrier", "ansi_map.digits_carrier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Digits", HFILL }},
+        "Digits", HFILL }},
     { &hf_ansi_map_digits_dest,
       { "digits-dest", "ansi_map.digits_dest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Digits", HFILL }},
+        "Digits", HFILL }},
     { &hf_ansi_map_dmh_ServiceID,
       { "dmh-ServiceID", "ansi_map.dmh_ServiceID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DMH_ServiceID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lectronicSerialNumber,
       { "lectronicSerialNumber", "ansi_map.lectronicSerialNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ElectronicSerialNumber", HFILL }},
+        "ElectronicSerialNumber", HFILL }},
     { &hf_ansi_map_deregistrationType,
       { "deregistrationType", "ansi_map.deregistrationType",
         FT_UINT32, BASE_DEC, VALS(ansi_map_DeregistrationType_vals), 0,
-        "ansi_map.DeregistrationType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_servicesResult,
       { "servicesResult", "ansi_map.servicesResult",
         FT_UINT8, BASE_DEC, VALS(ansi_map_ServicesResult_ppr_vals), 0x03,
-        "ansi_map.ServicesResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_MessageWaitingIndicator,
       { "sms-MessageWaitingIndicator", "ansi_map.sms_MessageWaitingIndicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_MessageWaitingIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_originationTriggers,
       { "originationTriggers", "ansi_map.originationTriggers",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.OriginationTriggers", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_featureIndicator,
       { "featureIndicator", "ansi_map.featureIndicator",
         FT_UINT32, BASE_DEC, VALS(ansi_map_FeatureIndicator_vals), 0,
-        "ansi_map.FeatureIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmh_ChargeInformation,
       { "dmh-ChargeInformation", "ansi_map.dmh_ChargeInformation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DMH_ChargeInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationInformationCode,
       { "qualificationInformationCode", "ansi_map.qualificationInformationCode",
         FT_UINT32, BASE_DEC, VALS(ansi_map_QualificationInformationCode_vals), 0,
-        "ansi_map.QualificationInformationCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authorizationDenied,
       { "authorizationDenied", "ansi_map.authorizationDenied",
         FT_UINT32, BASE_DEC, VALS(ansi_map_AuthorizationDenied_vals), 0,
-        "ansi_map.AuthorizationDenied", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authorizationPeriod,
       { "authorizationPeriod", "ansi_map.authorizationPeriod",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AuthorizationPeriod", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_deniedAuthorizationPeriod,
       { "deniedAuthorizationPeriod", "ansi_map.deniedAuthorizationPeriod",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DeniedAuthorizationPeriod", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationCapability,
       { "authenticationCapability", "ansi_map.authenticationCapability",
         FT_UINT8, BASE_DEC, VALS(ansi_map_AuthenticationCapability_vals), 0,
-        "ansi_map.AuthenticationCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callingFeaturesIndicator,
       { "callingFeaturesIndicator", "ansi_map.callingFeaturesIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CallingFeaturesIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_geographicAuthorization,
       { "geographicAuthorization", "ansi_map.geographicAuthorization",
         FT_UINT8, BASE_DEC, VALS(ansi_map_GeographicAuthorization_vals), 0,
-        "ansi_map.GeographicAuthorization", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_meidValidated,
       { "meidValidated", "ansi_map.meidValidated",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MEIDValidated", HFILL }},
+        NULL, HFILL }},
+    { &hf_ansi_map_mobilePositionCapability,
+      { "mobilePositionCapability", "ansi_map.mobilePositionCapability",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_originationIndicator,
       { "originationIndicator", "ansi_map.originationIndicator",
         FT_UINT32, BASE_DEC, VALS(ansi_map_OriginationIndicator_vals), 0,
-        "ansi_map.OriginationIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_restrictionDigits,
       { "restrictionDigits", "ansi_map.restrictionDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RestrictionDigits", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginationRestrictions,
       { "sms-OriginationRestrictions", "ansi_map.sms_OriginationRestrictions",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginationRestrictions", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_TerminationRestrictions,
       { "sms-TerminationRestrictions", "ansi_map.sms_TerminationRestrictions",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_TerminationRestrictions", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_spinipin,
       { "spinipin", "ansi_map.spinipin",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SPINIPIN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_spiniTriggers,
       { "spiniTriggers", "ansi_map.spiniTriggers",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SPINITriggers", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_terminationRestrictionCode,
       { "terminationRestrictionCode", "ansi_map.terminationRestrictionCode",
         FT_UINT32, BASE_DEC, VALS(ansi_map_TerminationRestrictionCode_vals), 0,
-        "ansi_map.TerminationRestrictionCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_userGroup,
       { "userGroup", "ansi_map.userGroup",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.UserGroup", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lirMode,
       { "lirMode", "ansi_map.lirMode",
         FT_UINT32, BASE_DEC, VALS(ansi_map_LIRMode_vals), 0,
-        "ansi_map.LIRMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randValidTime,
       { "randValidTime", "ansi_map.randValidTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RANDValidTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectionReason,
       { "redirectionReason", "ansi_map.redirectionReason",
         FT_UINT32, BASE_DEC, VALS(ansi_map_RedirectionReason_vals), 0,
-        "ansi_map.RedirectionReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cancellationType,
       { "cancellationType", "ansi_map.cancellationType",
         FT_UINT8, BASE_DEC, VALS(ansi_map_CancellationType_vals), 0,
-        "ansi_map.CancellationType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_controlChannelData,
       { "controlChannelData", "ansi_map.controlChannelData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ControlChannelData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_receivedSignalQuality,
       { "receivedSignalQuality", "ansi_map.receivedSignalQuality",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.ReceivedSignalQuality", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_systemAccessData,
       { "systemAccessData", "ansi_map.systemAccessData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SystemAccessData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cancellationDenied,
       { "cancellationDenied", "ansi_map.cancellationDenied",
         FT_UINT32, BASE_DEC, VALS(ansi_map_CancellationDenied_vals), 0,
-        "ansi_map.CancellationDenied", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_availabilityType,
       { "availabilityType", "ansi_map.availabilityType",
         FT_UINT8, BASE_DEC, VALS(ansi_map_AvailabilityType_vals), 0,
-        "ansi_map.AvailabilityType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_borderCellAccess,
       { "borderCellAccess", "ansi_map.borderCellAccess",
         FT_UINT32, BASE_DEC, VALS(ansi_map_BorderCellAccess_vals), 0,
-        "ansi_map.BorderCellAccess", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_msc_Address,
       { "msc-Address", "ansi_map.msc_Address",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MSC_Address", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_Address,
       { "sms-Address", "ansi_map.sms_Address",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_Address", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mpcAddress,
       { "mpcAddress", "ansi_map.mpcAddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MPCAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mpcAddressList,
       { "mpcAddressList", "ansi_map.mpcAddressList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MPCAddressList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_digits_Carrier,
       { "digits-Carrier", "ansi_map.digits_Carrier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Digits", HFILL }},
+        "Digits", HFILL }},
     { &hf_ansi_map_digitCollectionControl,
       { "digitCollectionControl", "ansi_map.digitCollectionControl",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DigitCollectionControl", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_trunkStatus,
       { "trunkStatus", "ansi_map.trunkStatus",
         FT_UINT32, BASE_DEC, VALS(ansi_map_TrunkStatus_vals), 0,
-        "ansi_map.TrunkStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_voiceMailboxNumber,
       { "voiceMailboxNumber", "ansi_map.voiceMailboxNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.VoiceMailboxNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_voiceMailboxPIN,
       { "voiceMailboxPIN", "ansi_map.voiceMailboxPIN",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.VoiceMailboxPIN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_BearerData,
       { "sms-BearerData", "ansi_map.sms_BearerData",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_BearerData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_TeleserviceIdentifier,
       { "sms-TeleserviceIdentifier", "ansi_map.sms_TeleserviceIdentifier",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_TeleserviceIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_ChargeIndicator,
       { "sms-ChargeIndicator", "ansi_map.sms_ChargeIndicator",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_ChargeIndicator_vals), 0,
-        "ansi_map.SMS_ChargeIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_DestinationAddress,
       { "sms-DestinationAddress", "ansi_map.sms_DestinationAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_DestinationAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationAddress,
       { "sms-OriginalDestinationAddress", "ansi_map.sms_OriginalDestinationAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginalDestinationAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationSubaddress,
       { "sms-OriginalDestinationSubaddress", "ansi_map.sms_OriginalDestinationSubaddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginalDestinationSubaddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingAddress,
       { "sms-OriginalOriginatingAddress", "ansi_map.sms_OriginalOriginatingAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginalOriginatingAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingSubaddress,
       { "sms-OriginalOriginatingSubaddress", "ansi_map.sms_OriginalOriginatingSubaddress",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginalOriginatingSubaddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_OriginatingAddress,
       { "sms-OriginatingAddress", "ansi_map.sms_OriginatingAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_OriginatingAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_CauseCode,
       { "sms-CauseCode", "ansi_map.sms_CauseCode",
-        FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_CauseCode_vals), 0,
-        "ansi_map.SMS_CauseCode", HFILL }},
+        FT_UINT8, BASE_DEC|BASE_EXT_STRING|BASE_EXT_STRING, &ansi_map_SMS_CauseCode_vals_ext, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServingOneWayDelay2,
       { "cdmaServingOneWayDelay2", "ansi_map.cdmaServingOneWayDelay2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServingOneWayDelay2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interMessageTime,
       { "interMessageTime", "ansi_map.interMessageTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.InterMessageTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_newlyAssignedIMSI,
       { "newlyAssignedIMSI", "ansi_map.newlyAssignedIMSI",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NewlyAssignedIMSI", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_newlyAssignedMIN,
       { "newlyAssignedMIN", "ansi_map.newlyAssignedMIN",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.NewlyAssignedMIN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_newMINExtension,
       { "newMINExtension", "ansi_map.newMINExtension",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NewMINExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_MessageCount,
       { "sms-MessageCount", "ansi_map.sms_MessageCount",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_MessageCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_NotificationIndicator,
       { "sms-NotificationIndicator", "ansi_map.sms_NotificationIndicator",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_NotificationIndicator_vals), 0,
-        "ansi_map.SMS_NotificationIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_teleservice_Priority,
       { "teleservice-Priority", "ansi_map.teleservice_Priority",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.Teleservice_Priority", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_temporaryReferenceNumber,
       { "temporaryReferenceNumber", "ansi_map.temporaryReferenceNumber",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TemporaryReferenceNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mobileStationMSID,
       { "mobileStationMSID", "ansi_map.mobileStationMSID",
         FT_UINT32, BASE_DEC, VALS(ansi_map_MobileStationMSID_vals), 0,
-        "ansi_map.MobileStationMSID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_TransactionID,
       { "sms-TransactionID", "ansi_map.sms_TransactionID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SMS_TransactionID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sms_AccessDeniedReason,
       { "sms-AccessDeniedReason", "ansi_map.sms_AccessDeniedReason",
         FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_AccessDeniedReason_vals), 0,
-        "ansi_map.SMS_AccessDeniedReason", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_seizureType,
       { "seizureType", "ansi_map.seizureType",
         FT_UINT32, BASE_DEC, VALS(ansi_map_SeizureType_vals), 0,
-        "ansi_map.SeizureType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_requiredParametersMask,
       { "requiredParametersMask", "ansi_map.requiredParametersMask",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RequiredParametersMask", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_reasonList,
       { "reasonList", "ansi_map.reasonList",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ReasonList_vals), 0,
-        "ansi_map.ReasonList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_networkTMSIExpirationTime,
       { "networkTMSIExpirationTime", "ansi_map.networkTMSIExpirationTime",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NetworkTMSIExpirationTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_newNetworkTMSI,
       { "newNetworkTMSI", "ansi_map.newNetworkTMSI",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.NewNetworkTMSI", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceID,
       { "serviceID", "ansi_map.serviceID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataAccessElementList,
       { "dataAccessElementList", "ansi_map.dataAccessElementList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.DataAccessElementList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_timeDateOffset,
       { "timeDateOffset", "ansi_map.timeDateOffset",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TimeDateOffset", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_timeOfDay,
       { "timeOfDay", "ansi_map.timeOfDay",
         FT_INT32, BASE_DEC, NULL, 0,
-        "ansi_map.TimeOfDay", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dmd_BillingIndicator,
       { "dmd-BillingIndicator", "ansi_map.dmd_BillingIndicator",
         FT_UINT32, BASE_DEC, VALS(ansi_map_DMH_BillingIndicator_vals), 0,
-        "ansi_map.DMH_BillingIndicator", HFILL }},
+        "DMH_BillingIndicator", HFILL }},
     { &hf_ansi_map_failureType,
       { "failureType", "ansi_map.failureType",
         FT_UINT32, BASE_DEC, VALS(ansi_map_FailureType_vals), 0,
-        "ansi_map.FailureType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_failureCause,
       { "failureCause", "ansi_map.failureCause",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.FailureCause", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_outingDigits,
       { "outingDigits", "ansi_map.outingDigits",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.RoutingDigits", HFILL }},
+        "RoutingDigits", HFILL }},
     { &hf_ansi_map_databaseKey,
       { "databaseKey", "ansi_map.databaseKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DatabaseKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_modificationRequestList,
       { "modificationRequestList", "ansi_map.modificationRequestList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.ModificationRequestList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_modificationResultList,
       { "modificationResultList", "ansi_map.modificationResultList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.ModificationResultList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceDataAccessElementList,
       { "serviceDataAccessElementList", "ansi_map.serviceDataAccessElementList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.ServiceDataAccessElementList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_privateSpecializedResource,
       { "privateSpecializedResource", "ansi_map.privateSpecializedResource",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PrivateSpecializedResource", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_specializedResource,
       { "specializedResource", "ansi_map.specializedResource",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.SpecializedResource", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_executeScript,
       { "executeScript", "ansi_map.executeScript",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ExecuteScript", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_scriptResult,
       { "scriptResult", "ansi_map.scriptResult",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ScriptResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdmaVoiceMode,
       { "tdmaVoiceMode", "ansi_map.tdmaVoiceMode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMAVoiceMode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callStatus,
       { "callStatus", "ansi_map.callStatus",
         FT_UINT32, BASE_DEC, VALS(ansi_map_CallStatus_vals), 0,
-        "ansi_map.CallStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_releaseCause,
       { "releaseCause", "ansi_map.releaseCause",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ReleaseCause_vals), 0,
-        "ansi_map.ReleaseCause", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callRecoveryIDList,
       { "callRecoveryIDList", "ansi_map.callRecoveryIDList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CallRecoveryIDList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionInformationCode,
       { "positionInformationCode", "ansi_map.positionInformationCode",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PositionInformationCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mSStatus,
       { "mSStatus", "ansi_map.mSStatus",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MSStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pSID_RSIDInformation,
       { "pSID-RSIDInformation", "ansi_map.pSID_RSIDInformation",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PSID_RSIDInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionRequestType,
       { "positionRequestType", "ansi_map.positionRequestType",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PositionRequestType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lcsBillingID,
       { "lcsBillingID", "ansi_map.lcsBillingID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.LCSBillingID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lcs_Client_ID,
       { "lcs-Client-ID", "ansi_map.lcs_Client_ID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.LCS_Client_ID", HFILL }},
-    { &hf_ansi_map_mobilePositionCapability,
-      { "mobilePositionCapability", "ansi_map.mobilePositionCapability",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MobilePositionCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dtxIndication,
       { "dtxIndication", "ansi_map.dtxIndication",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DTXIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaCodeChannel,
       { "cdmaCodeChannel", "ansi_map.cdmaCodeChannel",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMACodeChannel", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaMobileCapabilities,
       { "cdmaMobileCapabilities", "ansi_map.cdmaMobileCapabilities",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAMobileCapabilities", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaPSMMList,
       { "cdmaPSMMList", "ansi_map.cdmaPSMMList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMAPSMMList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdma_MAHO_CELLID,
       { "tdma-MAHO-CELLID", "ansi_map.tdma_MAHO_CELLID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMA_MAHO_CELLID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdma_MAHO_CHANNEL,
       { "tdma-MAHO-CHANNEL", "ansi_map.tdma_MAHO_CHANNEL",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMA_MAHO_CHANNEL", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdma_TimeAlignment,
       { "tdma-TimeAlignment", "ansi_map.tdma_TimeAlignment",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMA_TimeAlignment", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_HorizontalPosition,
       { "pqos-HorizontalPosition", "ansi_map.pqos_HorizontalPosition",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_HorizontalPosition", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_HorizontalVelocity,
       { "pqos-HorizontalVelocity", "ansi_map.pqos_HorizontalVelocity",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_HorizontalVelocity", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_MaximumPositionAge,
       { "pqos-MaximumPositionAge", "ansi_map.pqos_MaximumPositionAge",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_MaximumPositionAge", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_PositionPriority,
       { "pqos-PositionPriority", "ansi_map.pqos_PositionPriority",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_PositionPriority", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_ResponseTime,
       { "pqos-ResponseTime", "ansi_map.pqos_ResponseTime",
         FT_UINT32, BASE_DEC, VALS(ansi_map_PQOS_ResponseTime_vals), 0,
-        "ansi_map.PQOS_ResponseTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_VerticalPosition,
       { "pqos-VerticalPosition", "ansi_map.pqos_VerticalPosition",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_VerticalPosition", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pqos_VerticalVelocity,
       { "pqos-VerticalVelocity", "ansi_map.pqos_VerticalVelocity",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PQOS_VerticalVelocity", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaPSMMCount,
       { "cdmaPSMMCount", "ansi_map.cdmaPSMMCount",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPSMMCount", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lirAuthorization,
       { "lirAuthorization", "ansi_map.lirAuthorization",
         FT_UINT32, BASE_DEC, VALS(ansi_map_LIRAuthorization_vals), 0,
-        "ansi_map.LIRAuthorization", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mpcid,
       { "mpcid", "ansi_map.mpcid",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MPCID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tdma_MAHORequest,
       { "tdma-MAHORequest", "ansi_map.tdma_MAHORequest",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TDMA_MAHORequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionResult,
       { "positionResult", "ansi_map.positionResult",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PositionResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionInformation,
       { "positionInformation", "ansi_map.positionInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_controlType,
       { "controlType", "ansi_map.controlType",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ControlType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_destinationAddress,
       { "destinationAddress", "ansi_map.destinationAddress",
         FT_UINT32, BASE_DEC, VALS(ansi_map_DestinationAddress_vals), 0,
-        "ansi_map.DestinationAddress", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_gapDuration,
       { "gapDuration", "ansi_map.gapDuration",
         FT_UINT32, BASE_DEC, VALS(ansi_map_GapDuration_vals), 0,
-        "ansi_map.GapDuration", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_gapInterval,
       { "gapInterval", "ansi_map.gapInterval",
         FT_UINT32, BASE_DEC, VALS(ansi_map_GapInterval_vals), 0,
-        "ansi_map.GapInterval", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_invokingNEType,
       { "invokingNEType", "ansi_map.invokingNEType",
         FT_INT32, BASE_DEC, NULL, 0,
-        "ansi_map.InvokingNEType", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_range,
       { "range", "ansi_map.range",
         FT_INT32, BASE_DEC, NULL, 0,
-        "ansi_map.Range", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_meidStatus,
       { "meidStatus", "ansi_map.meidStatus",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MEIDStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_aKeyProtocolVersion,
       { "aKeyProtocolVersion", "ansi_map.aKeyProtocolVersion",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AKeyProtocolVersion", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mobileStationPartialKey,
       { "mobileStationPartialKey", "ansi_map.mobileStationPartialKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MobileStationPartialKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_newlyAssignedMSID,
       { "newlyAssignedMSID", "ansi_map.newlyAssignedMSID",
         FT_UINT32, BASE_DEC, VALS(ansi_map_NewlyAssignedMSID_vals), 0,
-        "ansi_map.NewlyAssignedMSID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_baseStationPartialKey,
       { "baseStationPartialKey", "ansi_map.baseStationPartialKey",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.BaseStationPartialKey", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_modulusValue,
       { "modulusValue", "ansi_map.modulusValue",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ModulusValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_otasp_ResultCode,
       { "otasp-ResultCode", "ansi_map.otasp_ResultCode",
         FT_UINT8, BASE_DEC, VALS(ansi_map_OTASP_ResultCode_vals), 0,
-        "ansi_map.OTASP_ResultCode", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_primitiveValue,
       { "primitiveValue", "ansi_map.primitiveValue",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PrimitiveValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_record_Type,
       { "record-Type", "ansi_map.record_Type",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.Record_Type", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_information_Record,
       { "information-Record", "ansi_map.information_Record",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.Information_Record", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdma2000MobileSupportedCapabilities,
       { "cdma2000MobileSupportedCapabilities", "ansi_map.cdma2000MobileSupportedCapabilities",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMA2000MobileSupportedCapabilities", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_announcementCode1,
       { "announcementCode1", "ansi_map.announcementCode1",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AnnouncementCode", HFILL }},
+        "AnnouncementCode", HFILL }},
     { &hf_ansi_map_announcementCode2,
       { "announcementCode2", "ansi_map.announcementCode2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AnnouncementCode", HFILL }},
+        "AnnouncementCode", HFILL }},
     { &hf_ansi_map_cdmaPilotPN,
       { "cdmaPilotPN", "ansi_map.cdmaPilotPN",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPilotPN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaPowerCombinedIndicator,
       { "cdmaPowerCombinedIndicator", "ansi_map.cdmaPowerCombinedIndicator",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPowerCombinedIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMACodeChannelList_item,
       { "CDMACodeChannelInformation", "ansi_map.CDMACodeChannelInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMACodeChannelInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaPilotStrength,
       { "cdmaPilotStrength", "ansi_map.cdmaPilotStrength",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPilotStrength", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaTargetOneWayDelay,
       { "cdmaTargetOneWayDelay", "ansi_map.cdmaTargetOneWayDelay",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMATargetOneWayDelay", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMATargetMAHOList_item,
       { "CDMATargetMAHOInformation", "ansi_map.CDMATargetMAHOInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMATargetMAHOInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaSignalQuality,
       { "cdmaSignalQuality", "ansi_map.cdmaSignalQuality",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMASignalQuality", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMATargetMeasurementList_item,
       { "CDMATargetMeasurementInformation", "ansi_map.CDMATargetMeasurementInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMATargetMeasurementInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_TargetMeasurementList_item,
       { "TargetMeasurementInformation", "ansi_map.TargetMeasurementInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TargetMeasurementInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_TerminationList_item,
       { "TerminationList item", "ansi_map.TerminationList_item",
         FT_UINT32, BASE_DEC, VALS(ansi_map_TerminationList_item_vals), 0,
-        "ansi_map.TerminationList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_intersystemTermination,
       { "intersystemTermination", "ansi_map.intersystemTermination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.IntersystemTermination", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_localTermination,
       { "localTermination", "ansi_map.localTermination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.LocalTermination", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pstnTermination,
       { "pstnTermination", "ansi_map.pstnTermination",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PSTNTermination", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMABandClassList_item,
       { "CDMABandClassInformation", "ansi_map.CDMABandClassInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMABandClassInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMAServiceOptionList_item,
       { "CDMAServiceOption", "ansi_map.CDMAServiceOption",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServiceOption", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pSID_RSIDInformation1,
       { "pSID-RSIDInformation1", "ansi_map.pSID_RSIDInformation1",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PSID_RSIDInformation", HFILL }},
+        "PSID_RSIDInformation", HFILL }},
     { &hf_ansi_map_targetCellID1,
       { "targetCellID1", "ansi_map.targetCellID1",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TargetCellID", HFILL }},
+        "TargetCellID", HFILL }},
     { &hf_ansi_map_cdmaConnectionReference,
       { "cdmaConnectionReference", "ansi_map.cdmaConnectionReference",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAConnectionReference", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaState,
       { "cdmaState", "ansi_map.cdmaState",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAState", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaServiceOptionConnectionIdentifier,
       { "cdmaServiceOptionConnectionIdentifier", "ansi_map.cdmaServiceOptionConnectionIdentifier",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAServiceOptionConnectionIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMAConnectionReferenceList_item,
       { "CDMAConnectionReferenceList item", "ansi_map.CDMAConnectionReferenceList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAConnectionReferenceList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceInformation,
       { "cdmaConnectionReferenceInformation", "ansi_map.cdmaConnectionReferenceInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAConnectionReferenceInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceInformation2,
       { "cdmaConnectionReferenceInformation2", "ansi_map.cdmaConnectionReferenceInformation2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAConnectionReferenceInformation", HFILL }},
+        "CDMAConnectionReferenceInformation", HFILL }},
     { &hf_ansi_map_analogRedirectInfo,
       { "analogRedirectInfo", "ansi_map.analogRedirectInfo",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.AnalogRedirectInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMAChannelNumberList_item,
       { "CDMAChannelNumberList item", "ansi_map.CDMAChannelNumberList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAChannelNumberList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaChannelNumber,
       { "cdmaChannelNumber", "ansi_map.cdmaChannelNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAChannelNumber", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaChannelNumber2,
       { "cdmaChannelNumber2", "ansi_map.cdmaChannelNumber2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAChannelNumber", HFILL }},
+        "CDMAChannelNumber", HFILL }},
     { &hf_ansi_map_cdmaChannelNumberList,
       { "cdmaChannelNumberList", "ansi_map.cdmaChannelNumberList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMAChannelNumberList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataID,
       { "dataID", "ansi_map.dataID",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DataID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_change,
       { "change", "ansi_map.change",
         FT_UINT32, BASE_DEC, VALS(ansi_map_Change_vals), 0,
-        "ansi_map.Change", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataValue,
       { "dataValue", "ansi_map.dataValue",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.DataValue", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_DataAccessElementList_item,
       { "DataAccessElementList item", "ansi_map.DataAccessElementList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DataAccessElementList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataAccessElement1,
       { "dataAccessElement1", "ansi_map.dataAccessElement1",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DataAccessElement", HFILL }},
+        "DataAccessElement", HFILL }},
     { &hf_ansi_map_dataAccessElement2,
       { "dataAccessElement2", "ansi_map.dataAccessElement2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DataAccessElement", HFILL }},
+        "DataAccessElement", HFILL }},
     { &hf_ansi_map_dataResult,
       { "dataResult", "ansi_map.dataResult",
         FT_UINT32, BASE_DEC, VALS(ansi_map_DataResult_vals), 0,
-        "ansi_map.DataResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_DataUpdateResultList_item,
       { "DataUpdateResult", "ansi_map.DataUpdateResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DataUpdateResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_globalTitle,
       { "globalTitle", "ansi_map.globalTitle",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.GlobalTitle", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_pC_SSN,
       { "pC-SSN", "ansi_map.pC_SSN",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PC_SSN", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_scriptName,
       { "scriptName", "ansi_map.scriptName",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ScriptName", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_scriptArgument,
       { "scriptArgument", "ansi_map.scriptArgument",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.ScriptArgument", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_allOrNone,
       { "allOrNone", "ansi_map.allOrNone",
         FT_UINT32, BASE_DEC, VALS(ansi_map_AllOrNone_vals), 0,
-        "ansi_map.AllOrNone", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ModificationRequestList_item,
       { "ModificationRequest", "ansi_map.ModificationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ModificationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceDataResultList,
       { "serviceDataResultList", "ansi_map.serviceDataResultList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.ServiceDataResultList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ModificationResultList_item,
       { "ModificationResult", "ansi_map.ModificationResult",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ModificationResult_vals), 0,
-        "ansi_map.ModificationResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ServiceDataAccessElementList_item,
       { "ServiceDataAccessElement", "ansi_map.ServiceDataAccessElement",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceDataAccessElement", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dataUpdateResultList,
       { "dataUpdateResultList", "ansi_map.dataUpdateResultList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.DataUpdateResultList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_ServiceDataResultList_item,
       { "ServiceDataResult", "ansi_map.ServiceDataResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceDataResult", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_triggerList,
       { "triggerList", "ansi_map.triggerList",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TriggerList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_triggerListOpt,
       { "triggerListOpt", "ansi_map.triggerListOpt",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TriggerList", HFILL }},
+        "TriggerList", HFILL }},
     { &hf_ansi_map_wIN_TriggerList,
       { "wIN-TriggerList", "ansi_map.wIN_TriggerList",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.WIN_TriggerList", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_triggerCapability,
       { "triggerCapability", "ansi_map.triggerCapability",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.TriggerCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_wINOperationsCapability,
       { "wINOperationsCapability", "ansi_map.wINOperationsCapability",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.WINOperationsCapability", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CallRecoveryIDList_item,
       { "CallRecoveryID", "ansi_map.CallRecoveryID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallRecoveryID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_generalizedTime,
       { "generalizedTime", "ansi_map.generalizedTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ansi_map.GeneralizedTime", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_geographicPosition,
       { "geographicPosition", "ansi_map.geographicPosition",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.GeographicPosition", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionSource,
       { "positionSource", "ansi_map.positionSource",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.PositionSource", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_horizontal_Velocity,
       { "horizontal-Velocity", "ansi_map.horizontal_Velocity",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.Horizontal_Velocity", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_vertical_Velocity,
       { "vertical-Velocity", "ansi_map.vertical_Velocity",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.Vertical_Velocity", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sCFOverloadGapInterval,
       { "sCFOverloadGapInterval", "ansi_map.sCFOverloadGapInterval",
         FT_UINT32, BASE_DEC, VALS(ansi_map_SCFOverloadGapInterval_vals), 0,
-        "ansi_map.SCFOverloadGapInterval", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceManagementSystemGapInterval,
       { "serviceManagementSystemGapInterval", "ansi_map.serviceManagementSystemGapInterval",
         FT_UINT32, BASE_DEC, VALS(ansi_map_ServiceManagementSystemGapInterval_vals), 0,
-        "ansi_map.ServiceManagementSystemGapInterval", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_CDMAPSMMList_item,
       { "CDMAPSMMList item", "ansi_map.CDMAPSMMList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CDMAPSMMList_item", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_cdmaTargetMAHOList2,
       { "cdmaTargetMAHOList2", "ansi_map.cdmaTargetMAHOList2",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ansi_map.CDMATargetMAHOList", HFILL }},
+        "CDMATargetMAHOList", HFILL }},
     { &hf_ansi_map_mpcAddress2,
       { "mpcAddress2", "ansi_map.mpcAddress2",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MPCAddress", HFILL }},
+        "MPCAddress", HFILL }},
     { &hf_ansi_map_mobileStationIMSI,
       { "mobileStationIMSI", "ansi_map.mobileStationIMSI",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "ansi_map.MobileStationIMSI", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest,
       { "handoffMeasurementRequest", "ansi_map.handoffMeasurementRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffMeasurementRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective,
       { "facilitiesDirective", "ansi_map.facilitiesDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffBack,
       { "handoffBack", "ansi_map.handoffBack",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffBack", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesRelease,
       { "facilitiesRelease", "ansi_map.facilitiesRelease",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesRelease", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest,
       { "qualificationRequest", "ansi_map.qualificationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationDirective,
       { "qualificationDirective", "ansi_map.qualificationDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_blocking,
       { "blocking", "ansi_map.blocking",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Blocking", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_unblocking,
       { "unblocking", "ansi_map.unblocking",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Unblocking", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_resetCircuit,
       { "resetCircuit", "ansi_map.resetCircuit",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ResetCircuit", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_trunkTest,
       { "trunkTest", "ansi_map.trunkTest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TrunkTest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_trunkTestDisconnect,
       { "trunkTestDisconnect", "ansi_map.trunkTestDisconnect",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TrunkTestDisconnect", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_registrationNotification,
       { "registrationNotification", "ansi_map.registrationNotification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RegistrationNotification", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_registrationCancellation,
       { "registrationCancellation", "ansi_map.registrationCancellation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RegistrationCancellation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_locationRequest,
       { "locationRequest", "ansi_map.locationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.LocationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_routingRequest,
       { "routingRequest", "ansi_map.routingRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RoutingRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_featureRequest,
       { "featureRequest", "ansi_map.featureRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FeatureRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_unreliableRoamerDataDirective,
       { "unreliableRoamerDataDirective", "ansi_map.unreliableRoamerDataDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.UnreliableRoamerDataDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_mSInactive,
       { "mSInactive", "ansi_map.mSInactive",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MSInactive", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_transferToNumberRequest,
       { "transferToNumberRequest", "ansi_map.transferToNumberRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TransferToNumberRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectionRequest,
       { "redirectionRequest", "ansi_map.redirectionRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectionRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffToThird,
       { "handoffToThird", "ansi_map.handoffToThird",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffToThird", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_flashRequest,
       { "flashRequest", "ansi_map.flashRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FlashRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationDirective,
       { "authenticationDirective", "ansi_map.authenticationDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationRequest,
       { "authenticationRequest", "ansi_map.authenticationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_baseStationChallenge,
       { "baseStationChallenge", "ansi_map.baseStationChallenge",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.BaseStationChallenge", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationFailureReport,
       { "authenticationFailureReport", "ansi_map.authenticationFailureReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationFailureReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_countRequest,
       { "countRequest", "ansi_map.countRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CountRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPage,
       { "interSystemPage", "ansi_map.interSystemPage",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPage", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_unsolicitedResponse,
       { "unsolicitedResponse", "ansi_map.unsolicitedResponse",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.UnsolicitedResponse", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_bulkDeregistration,
       { "bulkDeregistration", "ansi_map.bulkDeregistration",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.BulkDeregistration", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest2,
       { "handoffMeasurementRequest2", "ansi_map.handoffMeasurementRequest2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffMeasurementRequest2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective2,
       { "facilitiesDirective2", "ansi_map.facilitiesDirective2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesDirective2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffBack2,
       { "handoffBack2", "ansi_map.handoffBack2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffBack2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffToThird2,
       { "handoffToThird2", "ansi_map.handoffToThird2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffToThird2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveForward,
       { "authenticationDirectiveForward", "ansi_map.authenticationDirectiveForward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationDirectiveForward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationStatusReport,
       { "authenticationStatusReport", "ansi_map.authenticationStatusReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationStatusReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_informationDirective,
       { "informationDirective", "ansi_map.informationDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InformationDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_informationForward,
       { "informationForward", "ansi_map.informationForward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InformationForward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemAnswer,
       { "interSystemAnswer", "ansi_map.interSystemAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPage2,
       { "interSystemPage2", "ansi_map.interSystemPage2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPage2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemSetup,
       { "interSystemSetup", "ansi_map.interSystemSetup",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemSetup", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_originationRequest,
       { "originationRequest", "ansi_map.originationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OriginationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableRequest,
       { "randomVariableRequest", "ansi_map.randomVariableRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_redirectionDirective,
       { "redirectionDirective", "ansi_map.redirectionDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RedirectionDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_remoteUserInteractionDirective,
       { "remoteUserInteractionDirective", "ansi_map.remoteUserInteractionDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RemoteUserInteractionDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryBackward,
       { "sMSDeliveryBackward", "ansi_map.sMSDeliveryBackward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryBackward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryForward,
       { "sMSDeliveryForward", "ansi_map.sMSDeliveryForward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryForward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryPointToPoint,
       { "sMSDeliveryPointToPoint", "ansi_map.sMSDeliveryPointToPoint",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryPointToPoint", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSNotification,
       { "sMSNotification", "ansi_map.sMSNotification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSNotification", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSRequest,
       { "sMSRequest", "ansi_map.sMSRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oTASPRequest,
       { "oTASPRequest", "ansi_map.oTASPRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OTASPRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_changeFacilities,
       { "changeFacilities", "ansi_map.changeFacilities",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ChangeFacilities", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_changeService,
       { "changeService", "ansi_map.changeService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ChangeService", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_parameterRequest,
       { "parameterRequest", "ansi_map.parameterRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ParameterRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tMSIDirective,
       { "tMSIDirective", "ansi_map.tMSIDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TMSIDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_numberPortabilityRequest,
       { "numberPortabilityRequest", "ansi_map.numberPortabilityRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.NumberPortabilityRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_serviceRequest,
       { "serviceRequest", "ansi_map.serviceRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_analyzedInformation,
       { "analyzedInformation", "ansi_map.analyzedInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AnalyzedInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_connectionFailureReport,
       { "connectionFailureReport", "ansi_map.connectionFailureReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ConnectionFailureReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_connectResource,
       { "connectResource", "ansi_map.connectResource",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ConnectResource", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitySelectedAndAvailable,
       { "facilitySelectedAndAvailable", "ansi_map.facilitySelectedAndAvailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitySelectedAndAvailable", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_modify,
       { "modify", "ansi_map.modify",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Modify", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_search,
       { "search", "ansi_map.search",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.Search", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_seizeResource,
       { "seizeResource", "ansi_map.seizeResource",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SeizeResource", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sRFDirective,
       { "sRFDirective", "ansi_map.sRFDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SRFDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tBusy,
       { "tBusy", "ansi_map.tBusy",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TBusy", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tNoAnswer,
       { "tNoAnswer", "ansi_map.tNoAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TNoAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_smsDeliveryPointToPointAck,
       { "smsDeliveryPointToPointAck", "ansi_map.smsDeliveryPointToPointAck",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryPointToPointAck", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_messageDirective,
       { "messageDirective", "ansi_map.messageDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.MessageDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_bulkDisconnection,
       { "bulkDisconnection", "ansi_map.bulkDisconnection",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.BulkDisconnection", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callControlDirective,
       { "callControlDirective", "ansi_map.callControlDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallControlDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oAnswer,
       { "oAnswer", "ansi_map.oAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oDisconnect,
       { "oDisconnect", "ansi_map.oDisconnect",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ODisconnect", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callRecoveryReport,
       { "callRecoveryReport", "ansi_map.callRecoveryReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallRecoveryReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tAnswer,
       { "tAnswer", "ansi_map.tAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tDisconnect,
       { "tDisconnect", "ansi_map.tDisconnect",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TDisconnect", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_unreliableCallData,
       { "unreliableCallData", "ansi_map.unreliableCallData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.UnreliableCallData", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oCalledPartyBusy,
       { "oCalledPartyBusy", "ansi_map.oCalledPartyBusy",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OCalledPartyBusy", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oNoAnswer,
       { "oNoAnswer", "ansi_map.oNoAnswer",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ONoAnswer", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionRequest,
       { "positionRequest", "ansi_map.positionRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionRequestForward,
       { "positionRequestForward", "ansi_map.positionRequestForward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionRequestForward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callTerminationReport,
       { "callTerminationReport", "ansi_map.callTerminationReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallTerminationReport", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_geoPositionRequest,
       { "geoPositionRequest", "ansi_map.geoPositionRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.GeoPositionRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequest,
       { "interSystemPositionRequest", "ansi_map.interSystemPositionRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPositionRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestForward,
       { "interSystemPositionRequestForward", "ansi_map.interSystemPositionRequestForward",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPositionRequestForward", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_aCGDirective,
       { "aCGDirective", "ansi_map.aCGDirective",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ACGDirective", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_roamerDatabaseVerificationRequest,
       { "roamerDatabaseVerificationRequest", "ansi_map.roamerDatabaseVerificationRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RoamerDatabaseVerificationRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_addService,
       { "addService", "ansi_map.addService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AddService", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dropService,
       { "dropService", "ansi_map.dropService",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DropService", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lcsParameterRequest,
       { "lcsParameterRequest", "ansi_map.lcsParameterRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.LCSParameterRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_checkMEID,
       { "checkMEID", "ansi_map.checkMEID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CheckMEID", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionEventNotification,
       { "positionEventNotification", "ansi_map.positionEventNotification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionEventNotification", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_statusRequest,
       { "statusRequest", "ansi_map.statusRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.StatusRequest", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSDeliveryPointToPoint,
       { "interSystemSMSDeliveryPointToPoint", "ansi_map.interSystemSMSDeliveryPointToPoint",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemSMSDeliveryPointToPoint", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest2,
       { "qualificationRequest2", "ansi_map.qualificationRequest2",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationRequest2", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequestRes,
       { "handoffMeasurementRequestRes", "ansi_map.handoffMeasurementRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffMeasurementRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirectiveRes,
       { "facilitiesDirectiveRes", "ansi_map.facilitiesDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffBackRes,
       { "handoffBackRes", "ansi_map.handoffBackRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffBackRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesReleaseRes,
       { "facilitiesReleaseRes", "ansi_map.facilitiesReleaseRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesReleaseRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationDirectiveRes,
       { "qualificationDirectiveRes", "ansi_map.qualificationDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationRequestRes,
       { "qualificationRequestRes", "ansi_map.qualificationRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_resetCircuitRes,
       { "resetCircuitRes", "ansi_map.resetCircuitRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ResetCircuitRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_registrationNotificationRes,
       { "registrationNotificationRes", "ansi_map.registrationNotificationRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RegistrationNotificationRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_registrationCancellationRes,
       { "registrationCancellationRes", "ansi_map.registrationCancellationRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RegistrationCancellationRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_locationRequestRes,
       { "locationRequestRes", "ansi_map.locationRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.LocationRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_routingRequestRes,
       { "routingRequestRes", "ansi_map.routingRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RoutingRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_featureRequestRes,
       { "featureRequestRes", "ansi_map.featureRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FeatureRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_transferToNumberRequestRes,
       { "transferToNumberRequestRes", "ansi_map.transferToNumberRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TransferToNumberRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffToThirdRes,
       { "handoffToThirdRes", "ansi_map.handoffToThirdRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffToThirdRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveRes,
       { "authenticationDirectiveRes", "ansi_map.authenticationDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationRequestRes,
       { "authenticationRequestRes", "ansi_map.authenticationRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_baseStationChallengeRes,
       { "baseStationChallengeRes", "ansi_map.baseStationChallengeRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.BaseStationChallengeRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationFailureReportRes,
       { "authenticationFailureReportRes", "ansi_map.authenticationFailureReportRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationFailureReportRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_countRequestRes,
       { "countRequestRes", "ansi_map.countRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CountRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPageRes,
       { "interSystemPageRes", "ansi_map.interSystemPageRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPageRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_unsolicitedResponseRes,
       { "unsolicitedResponseRes", "ansi_map.unsolicitedResponseRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.UnsolicitedResponseRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest2Res,
       { "handoffMeasurementRequest2Res", "ansi_map.handoffMeasurementRequest2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffMeasurementRequest2Res", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective2Res,
       { "facilitiesDirective2Res", "ansi_map.facilitiesDirective2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitiesDirective2Res", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffBack2Res,
       { "handoffBack2Res", "ansi_map.handoffBack2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffBack2Res", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_handoffToThird2Res,
       { "handoffToThird2Res", "ansi_map.handoffToThird2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.HandoffToThird2Res", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveForwardRes,
       { "authenticationDirectiveForwardRes", "ansi_map.authenticationDirectiveForwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationDirectiveForwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_authenticationStatusReportRes,
       { "authenticationStatusReportRes", "ansi_map.authenticationStatusReportRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AuthenticationStatusReportRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_informationDirectiveRes,
       { "informationDirectiveRes", "ansi_map.informationDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InformationDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_informationForwardRes,
       { "informationForwardRes", "ansi_map.informationForwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InformationForwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPage2Res,
       { "interSystemPage2Res", "ansi_map.interSystemPage2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPage2Res", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemSetupRes,
       { "interSystemSetupRes", "ansi_map.interSystemSetupRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemSetupRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_originationRequestRes,
       { "originationRequestRes", "ansi_map.originationRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OriginationRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_randomVariableRequestRes,
       { "randomVariableRequestRes", "ansi_map.randomVariableRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RandomVariableRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_remoteUserInteractionDirectiveRes,
       { "remoteUserInteractionDirectiveRes", "ansi_map.remoteUserInteractionDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RemoteUserInteractionDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryBackwardRes,
       { "sMSDeliveryBackwardRes", "ansi_map.sMSDeliveryBackwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryBackwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryForwardRes,
       { "sMSDeliveryForwardRes", "ansi_map.sMSDeliveryForwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryForwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryPointToPointRes,
       { "sMSDeliveryPointToPointRes", "ansi_map.sMSDeliveryPointToPointRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSDeliveryPointToPointRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSNotificationRes,
       { "sMSNotificationRes", "ansi_map.sMSNotificationRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSNotificationRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sMSRequestRes,
       { "sMSRequestRes", "ansi_map.sMSRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SMSRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oTASPRequestRes,
       { "oTASPRequestRes", "ansi_map.oTASPRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OTASPRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_changeFacilitiesRes,
       { "changeFacilitiesRes", "ansi_map.changeFacilitiesRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ChangeFacilitiesRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_changeServiceRes,
       { "changeServiceRes", "ansi_map.changeServiceRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ChangeServiceRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_parameterRequestRes,
       { "parameterRequestRes", "ansi_map.parameterRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ParameterRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tMSIDirectiveRes,
       { "tMSIDirectiveRes", "ansi_map.tMSIDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TMSIDirectiveRes", HFILL }},
+        NULL, HFILL }},
+    { &hf_ansi_map_numberPortabilityRequestRes,
+      { "numberPortabilityRequestRes", "ansi_map.numberPortabilityRequestRes",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_ansi_map_serviceRequestRes,
       { "serviceRequestRes", "ansi_map.serviceRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ServiceRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_analyzedInformationRes,
       { "analyzedInformationRes", "ansi_map.analyzedInformationRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AnalyzedInformationRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_facilitySelectedAndAvailableRes,
       { "facilitySelectedAndAvailableRes", "ansi_map.facilitySelectedAndAvailableRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.FacilitySelectedAndAvailableRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_modifyRes,
       { "modifyRes", "ansi_map.modifyRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ModifyRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_searchRes,
       { "searchRes", "ansi_map.searchRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SearchRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_seizeResourceRes,
       { "seizeResourceRes", "ansi_map.seizeResourceRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SeizeResourceRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_sRFDirectiveRes,
       { "sRFDirectiveRes", "ansi_map.sRFDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.SRFDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tBusyRes,
       { "tBusyRes", "ansi_map.tBusyRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TBusyRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tNoAnswerRes,
       { "tNoAnswerRes", "ansi_map.tNoAnswerRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TNoAnswerRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_callControlDirectiveRes,
       { "callControlDirectiveRes", "ansi_map.callControlDirectiveRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CallControlDirectiveRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oDisconnectRes,
       { "oDisconnectRes", "ansi_map.oDisconnectRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ODisconnectRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_tDisconnectRes,
       { "tDisconnectRes", "ansi_map.tDisconnectRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.TDisconnectRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oCalledPartyBusyRes,
       { "oCalledPartyBusyRes", "ansi_map.oCalledPartyBusyRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.OCalledPartyBusyRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_oNoAnswerRes,
       { "oNoAnswerRes", "ansi_map.oNoAnswerRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.ONoAnswerRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionRequestRes,
       { "positionRequestRes", "ansi_map.positionRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_positionRequestForwardRes,
       { "positionRequestForwardRes", "ansi_map.positionRequestForwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.PositionRequestForwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestRes,
       { "interSystemPositionRequestRes", "ansi_map.interSystemPositionRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPositionRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestForwardRes,
       { "interSystemPositionRequestForwardRes", "ansi_map.interSystemPositionRequestForwardRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemPositionRequestForwardRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_roamerDatabaseVerificationRequestRes,
       { "roamerDatabaseVerificationRequestRes", "ansi_map.roamerDatabaseVerificationRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.RoamerDatabaseVerificationRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_addServiceRes,
       { "addServiceRes", "ansi_map.addServiceRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.AddServiceRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_dropServiceRes,
       { "dropServiceRes", "ansi_map.dropServiceRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.DropServiceRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSPage,
       { "interSystemSMSPage", "ansi_map.interSystemSMSPage",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemSMSPage", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_lcsParameterRequestRes,
       { "lcsParameterRequestRes", "ansi_map.lcsParameterRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.LCSParameterRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_checkMEIDRes,
       { "checkMEIDRes", "ansi_map.checkMEIDRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.CheckMEIDRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_statusRequestRes,
       { "statusRequestRes", "ansi_map.statusRequestRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.StatusRequestRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSDeliveryPointToPointRes,
       { "interSystemSMSDeliveryPointToPointRes", "ansi_map.interSystemSMSDeliveryPointToPointRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.InterSystemSMSDeliveryPointToPointRes", HFILL }},
+        NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest2Res,
       { "qualificationRequest2Res", "ansi_map.qualificationRequest2Res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ansi_map.QualificationRequest2Res", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-ansi_map-hfarr.c ---*/
-#line 5279 "packet-ansi_map-template.c"
+#line 5317 "../../asn1/ansi_map/packet-ansi_map-template.c"
     };
 
     /* List of subtrees */
@@ -19339,7 +19423,7 @@ void proto_register_ansi_map(void) {
         &ett_systemcapabilities,
 
 /*--- Included file: packet-ansi_map-ettarr.c ---*/
-#line 1 "packet-ansi_map-ettarr.c"
+#line 1 "../../asn1/ansi_map/packet-ansi_map-ettarr.c"
     &ett_ansi_map_AuthenticationDirective_U,
     &ett_ansi_map_AuthenticationDirectiveRes_U,
     &ett_ansi_map_AuthenticationDirectiveForward_U,
@@ -19435,6 +19519,7 @@ void proto_register_ansi_map(void) {
     &ett_ansi_map_TMSIDirective_U,
     &ett_ansi_map_TMSIDirectiveRes_U,
     &ett_ansi_map_NumberPortabilityRequest_U,
+    &ett_ansi_map_NumberPortabilityRequestRes_U,
     &ett_ansi_map_ServiceRequest_U,
     &ett_ansi_map_ServiceRequestRes_U,
     &ett_ansi_map_AnalyzedInformation_U,
@@ -19564,9 +19649,15 @@ void proto_register_ansi_map(void) {
     &ett_ansi_map_ReturnData,
 
 /*--- End of included file: packet-ansi_map-ettarr.c ---*/
-#line 5312 "packet-ansi_map-template.c"
+#line 5350 "../../asn1/ansi_map/packet-ansi_map-template.c"
     };
 
+       static enum_val_t ansi_map_response_matching_type_values[] = {
+               {"Only Transaction ID will be used in Invoke/response matching",                                        "Transaction ID only", 0},
+               {"Transaction ID and Source will be used in Invoke/response matching",                          "Transaction ID and Source", 1},
+               {"Transaction ID Source and Destination will be used in Invoke/response matching",      "Transaction ID Source and Destination", 2},
+               {NULL, NULL, -1}
+       };
 
     /* Register protocol */
     proto_ansi_map = proto_register_protocol(PNAME, PSNAME, PFNAME);
@@ -19600,6 +19691,11 @@ void proto_register_ansi_map(void) {
                                     "ANSI MAP SSNs to decode as ANSI MAP",
                                     &global_ssn_range, MAX_SSN);
 
+       prefs_register_enum_preference(ansi_map_module, "transaction.matchtype",
+                                      "Type of matching invoke/response",
+                                      "Type of matching invoke/response, risk of missmatch if loose matching choosen",
+                                      &ansi_map_response_matching_type, ansi_map_response_matching_type_values, FALSE);
+
     register_init_routine(&ansi_map_init_protocol);
 }