Replaced the ArrayList and dedicated structure with a static LinkedHashMap.