Improve tool identification