Further abstraction of token handler