Add some more tools