Switch from synchronized to ConcurrentHashMap