New vendorsetup infrastructure