* Addition of SAML support