Added expression calculator.