adding new vendors, refactoring config