Mash billing info update around and add support for token_id