Added event management