More progress on event manager