Added support for simple parameters in functions