Updates to spec.utils/extract.metadata functions