Updated with event manager.