added by-vendor support