refactor based on Alex's suggestion, make it easier to combine multiple enrich strategies

[#71505794]