Added default ordering using OrderedDicts