Added token handler