Add field order, use an OrderedDict