Switch to new PubSub interface