Changed from HashMap to ConcurrentHashMap to add some protection agains threads in execution.