Added CCalculator class