Modified implementation of event management