Added CollectorCalculator.