Added support for module events.