Update to draft-13