Added some more useful local tools