Changes for root and vendor