Maintain state across setup and group changes