refactored the sso beans