Improve cell lookup times