Refactor: addEvents is now called addListeners