Added Troubleshooting tools