Added better support for loggers