FORGE-2032: Using TreeMap to keep the attribute order