Uppdated from ArrayList to HashMap