Add support for Closure rule