Improve debugging capabilities