Use new doc_items field names