Added a lot of tools