Updates to extract.metadata & extract.metadata.asd