Added support for more trig functions