Updated to match the RocketWebsocket branch