Switched from HashMap to ConcurrentHashMap