add token management