Update to draft-12