Updated order of fields