Added some functionality to events