Added support for vendors