Refactor publishers