Enhance debugging