Some changes to Pubsub interface