Added CalculationService