More updates to event manager functions