Added event listener support