Added vendor support