Use the same OrderedDict everywhere