Rework and simplify vendor