Changed synchronization to ConcurrentMap checks