Updated to the newest code from Vendor class.