Added support for new [Exposed] syntax