Change Synchronized(Set|Map) to Java concurrency