Minimal draft-01 implementation