more conversion to dynamic provider mapping