Change logging to use Logger