Changing to a concurrenthashmap