Port to new vendors path