Improved tools list