Replace old stuff from the XRM provider