Added some custom events