Changed collection from ArrayList to LinkedHashMap