Refactor to use topic factory. Rename constants to use new server/connection class name
Add new subscriptions for websocket