Added support for some more functions