Optimize lookup