Added saving fields defining order