Added support for closures