Added Arraylist and Hashmap