Update for draft11 protocol implementation