Added more listeners