Improved debug performance