Add retryStateWithActivation, rename moveToState