Adds token_id support to BillingInfo

:hamburger: :palm_tree: