Make addListeners private again