added company_id and vat_id