Added the ability to return the token object without having to pass a callback function