Changed the data list to a concurrent hashmap

And minor changes