Added SAML and JWT support