Moved Pubsub namespace to separate component