Now using hashmap instead of arrayList