Logging improvements
Logging improvements