Adding missing features related to sso