Speed up Vendor feature