Added billing_email support