Moved OAuthClient to CSA client