Added custom arithmetic parser