Enhance Troubleshooting