Change remaining instances of HashMap to LinkedHashMap