diff --git a/common/include/tfe_cmsg.h b/common/include/tfe_cmsg.h
index a46e36a..b8d7c3e 100644
--- a/common/include/tfe_cmsg.h
+++ b/common/include/tfe_cmsg.h
@@ -82,19 +82,34 @@ enum tfe_cmsg_tlv_type
     /* Share tsg scan result */
     TFE_CMSG_SRC_SUB_ID,              // string max size 256
     TFE_CMSG_DST_SUB_ID,              // string max size 256
-    TFE_CMSG_SRC_ASN,                 // string max size 64
-    TFE_CMSG_DST_ASN,                 // string max size 64
-    TFE_CMSG_SRC_ORGANIZATION,        // string max size 256
-    TFE_CMSG_DST_ORGANIZATION,        // string max size 256
-    TFE_CMSG_SRC_IP_LOCATION,         // string max size 256 * 4
-    TFE_CMSG_DST_IP_LOCATION,         // string max size 256 * 4
+    // ASN Value
+    TFE_CMSG_SRC_ASN_VAL,         // uint64_t
+    TFE_CMSG_DST_ASN_VAL,         // uint64_t
+    // ASN ID
+    TFE_CMSG_SRC_ASN_ID,          // uint64_t
+    TFE_CMSG_DST_ASN_ID,          // uint64_t
+    // Geo Location String
+    TFE_CMSG_SRC_REGION_STR,      // string max size 256
+    TFE_CMSG_DST_REGION_STR,      // string max size 256
+    TFE_CMSG_SRC_PROVINCE_STR,    // string max size 256
+    TFE_CMSG_DST_PROVINCE_STR,    // string max size 256
+    TFE_CMSG_SRC_CITY_STR,        // string max size 256
+    TFE_CMSG_DST_CITY_STR,        // string max size 256
+    TFE_CMSG_SRC_SUBDIVISION_STR, // string max size 256
+    TFE_CMSG_DST_SUBDIVISION_STR, // string max size 256
+    // Geo Location Object ID
+    TFE_CMSG_SRC_REGION_ID,       // uint64_t
+    TFE_CMSG_DST_REGION_ID,       // uint64_t
+    TFE_CMSG_SRC_PROVINCE_ID,     // uint64_t
+    TFE_CMSG_DST_PROVINCE_ID,     // uint64_t
+    TFE_CMSG_SRC_CITY_ID,         // uint64_t
+    TFE_CMSG_DST_CITY_ID,         // uint64_t
+    TFE_CMSG_SRC_SUBDIVISION_ID,  // uint64_t
+    TFE_CMSG_DST_SUBDIVISION_ID,  // uint64_t
 
     /* SSL ja3 fingerprint */
     TFE_CMSG_SSL_CLIENT_JA3_FINGERPRINT, // string max size 32
 
-    TFE_CMSG_FQDN_CAT_ID_NUM, // unsigned int
-    TFE_CMSG_FQDN_CAT_ID_VAL, // max size 8 * sizeof(unsigned int)
-
     // according to KNI -> MESA_dir_link_to_human()
     // 'E' or 'e': 表示发包方向是从Internal to External.
     // 'I' or 'i': 表示发包方向是从External to Internal.