Added listener code as well as Logger