Improve pubsub