Added more tools