Event listeners updated