Troubleshooter comment support added