Added a Listener class