Mocks
Refactor listener