Lookup improvements