Added support for simple functions