Faster lookup table access as per pull request review