Add spectator support