Added CalculationManager