Logging is under heavy refactoring ...