More publish refactoring