Make vendor more flexible