Add some more listeners