Improve map benchmarking