Add support for returning an existing token