Updating AccuracyCalculator to support subclasses better