Improve find key