Progress on EnrichmentConfigRegistry