Refactor listeners adding