Changed pubsub implementation