Improved vendor prefix handling