Updated tools for v1.0