Further improved vendor prefix API