Reworded spec and extracted document_id to module