DOCX: Performance improvement