Changed fields order