Change to vendor class