Added some tools