Added some more of the raw tools