Refactor feature publishing