Use add event listener to avoid overwriting events