Improve debug logging capability
Improve debug logging capability