Lots of changes + refactoring for SAML SSO