Switch from sychronized methods to ConcurrentHashMap