Added a few tools