Revamp websockets