Added some more pubsub functionality