Added support for a number of functions, and numerics