Improve findKey