Add output enrichment validation