More vendor setup