Improved debugging information