diff --git a/emmet-builders/tests/test_utils.py b/emmet-builders/tests/test_utils.py
index 82d509e100..b0d35076e4 100644
--- a/emmet-builders/tests/test_utils.py
+++ b/emmet-builders/tests/test_utils.py
@@ -68,7 +68,9 @@ def test_get_potcar_stats(method: str, tmp_path):
     try:
         potcar_stats = get_potcar_stats(method=method)
     except Exception as exc:
-        if "No POTCAR for" in str(exc):
+        if any(
+            exc_str in str(exc) for exc_str in ("Set PMG_VASP_PSP_DIR", "No POTCAR for")
+        ):
             # No Potcar library available, skip test
             return
         else:
diff --git a/emmet-core/emmet/core/tasks.py b/emmet-core/emmet/core/tasks.py
index 1879be6667..2d994dd58a 100644
--- a/emmet-core/emmet/core/tasks.py
+++ b/emmet-core/emmet/core/tasks.py
@@ -8,41 +8,36 @@
 from typing import Any, Dict, List, Optional, Tuple, Type, TypeVar, Union
 
 import numpy as np
+from monty.json import MontyDecoder
+from monty.serialization import loadfn
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+from pymatgen.analysis.structure_analyzer import oxide_type
+from pymatgen.core.structure import Structure
+from pymatgen.core.trajectory import Trajectory
+from pymatgen.entries.computed_entries import ComputedEntry, ComputedStructureEntry
+from pymatgen.io.vasp import Incar, Kpoints, Poscar
+from pymatgen.io.vasp import Potcar as VaspPotcar
+
 from emmet.core.common import convert_datetime
 from emmet.core.mpid import MPID
 from emmet.core.structure import StructureMetadata
 from emmet.core.utils import utcnow
 from emmet.core.vasp.calc_types import (
     CalcType,
-    calc_type,
+    RunType,
     TaskType,
+    calc_type,
     run_type,
-    RunType,
     task_type,
 )
 from emmet.core.vasp.calculation import (
-    CalculationInput,
     Calculation,
+    CalculationInput,
     PotcarSpec,
     RunStatistics,
     VaspObject,
 )
 from emmet.core.vasp.task_valid import TaskState
-from monty.json import MontyDecoder
-from monty.serialization import loadfn
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    field_validator,
-    model_validator,
-)
-from pymatgen.analysis.structure_analyzer import oxide_type
-from pymatgen.core.structure import Structure
-from pymatgen.core.trajectory import Trajectory
-from pymatgen.entries.computed_entries import ComputedEntry, ComputedStructureEntry
-from pymatgen.io.vasp import Incar, Kpoints, Poscar
-from pymatgen.io.vasp import Potcar as VaspPotcar
 
 monty_decoder = MontyDecoder()
 logger = logging.getLogger(__name__)
@@ -430,11 +425,20 @@ class TaskDoc(StructureMetadata, extra="allow"):
         description="Timestamp for the most recent calculation for this task document",
     )
 
+    completed_at: Optional[datetime] = Field(
+        None, description="Timestamp for when this task was completed"
+    )
+
     batch_id: Optional[str] = Field(
         None,
         description="Identifier for this calculation; should provide rough information about the calculation origin and purpose.",
     )
 
+    run_stats: Optional[RunStatistics] = Field(
+        None,
+        description="Summary of runtime statistics for each calculation in this task",
+    )
+
     # Note that private fields are needed because TaskDoc permits extra info
     # added to the model, unlike TaskDocument. Because of this, when pydantic looks up
     # attrs on the model, it searches for them in the model extra dict first, and if it