Added events to modules