Changed order of fields