faker listener refactoring