Unlimited fill - adding FillMatcher and FillAlgorithmSettings