Module event system enhanced