Added some more tools