(Minor) Add guest flag