switched to a vendor-based tree structure