Added external tool builder