Add guest and tenant support