Add checkMap
Switch to deterministic map