Modify to use new Logger class