Added more Events and Handlers