Added events for modules