Initial changes for sso