Adding a few more tools