improve treatment of vendor data