Update to support 'Groovy' language for functions