Complete basic token management