Added support for function arguments