Add first iteration of event management