Move persistence flag to st_state_t