Updates to support websockets between client and server and service and server