Add support for vendor prefixes