Refactored listeners to iterable.