Change to ConcurrentHashMap