Changes based on code review
Renamed module from discover to listener