Added support for basic math