Better vendor constraint