Adding more tools