Publishing refactor