Update to latest web socket API's