Improved lookup and auth.