Improved debugging capabilities