Added support for other functions