Modification for other vendors