Logging enhancement