Changed the map of data queues to use a pointer.
Added a new map for the new data events.
Both maps are updated with the add_filter and clear_filter functions.