Switched to a Concurrent map with Atomic values