Add a few more tools