Added listener class