Added event handling skeleton