Improved the Tools class.