Add support for vendor flag