Improve uniform lookup performance