Add vendorsetup until merged