Adding more useful tools