Improve find tool