Added support for basic calculations