Added support for different vendor prefixes