Serious changes to get enrichment working