Replaced HashMap with ConcurrentHashMap