Enhance troubleshooting