Added AccountsClient with modifications