Adds token_id support to BillingInfo

@cbarton all about those one-line changes