Started fleshing out the EnrichmentManager