Added more tools.