Added default event handling