Clarified Listener definitions