Changes to order of fields