-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_AS_cb_list; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_AS_cb_list; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_gateway_cb_list; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_gateway_cb_list; // added by david
-
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_ASroute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_cluster_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_include_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_include_cb_list;