Changed order of fields in AppState