Added pub/sub for server