Working on improving the event manager api.