Use new Stock::AvailabilityValidator