New format for the event_map (cleaner, but more node.js code...)