Adds token_id support to BillingInfo

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>