New way to handle vendor tree