Adds support for BillingInfo tokens

@aheckmann