Logging enhancements