Added pub-sub for comments