Changes to support SSO