update for SAML support