Added changes for externaltools plugin