added basic token management