Simplified code by using vendors instead