Added support for math functions