Use new doc_items interface