Make event listener generic again