Changed handler to listener