Added java.util.concurrent.ConcurrentHashMap
refactoring