Removed the handler and replaced it with the Listener API