Adding enrichment features back