Support new spectator change