add token management in client