Vendor and Event class updated