DemandMatcher improvements from minimart