Add support for pubsub messages