added company_id to billing_address