removed enrich mapping