Add ability to search by key