Update to use tools 0.3.x