add enhancement, find all keys