Updated to support Internet-Draft 11