Fixed more references and added ClientWebSocket for reference