fixing up provider mapping