Adding SSO feature to TM code base