Add token management on some methods