Change order of output fields