Added simpler module handling of event listeners