Added support for closure in production value