Add a couple more tools