Enrichment issue in Agent normalization