Logging improved