Vendors refactored