Improved lookup