Added Listener class