Another set of improvements on event module