Added a few more tools