Switch to ConcurrentHashMap