Improve find performance