Reordering some fields