Adding event management

Adding event management