Refactor UnitStatePublisher