Add some event handling