Added event and event manager