Rework publishers
Fix CS