Module events enhanced