Changed to a HashMap.