Partial implementation of enrichment,