Refactored vendor loading