Lookups refactor