Adds token_id support to BillingInfo

@cbarton