All working. Next step is to update EnrichmentManager to use the TransformMap