Add more pubsub functions