Added some more listeners