Added support for built-in functions