REFACTOR: Changes to the structure of lookup_key