Refactor pubsub