Added 'find_one_by_attributes' to context and refactored lookup to use it.