Changed to LinkedHashMap