Adding token managment