-/* Entry-point of the surfxml parser. */
-XBT_PUBLIC_DATA(int_f_void_t *) surf_parse;
-
-/* Hook for the different tags. They can be redefined at will whereas
- the versions without the _fun can't. */
-
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_argument_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_argument_fun;
+#include "xbt/dict.h"
+
+/* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_platform_description_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_description_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_process_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_process_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_argument_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_argument_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_prop_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_prop_cb_list;