Code changed to add VendorId