Enrichment & re-indexing