Re-added module event delegation