Improved PubSub client