Added a few new tools