Added some event listener