Improved tool selection