Updated for Tools release