Changed ArrayList to Hashmap