Updated to use latest changes to concurrent-map