Improve publish to direct listener