Added support for arbitrary array functions