after clean up
added SAML support