Added more event listeners