Replace old stuff from the XRM provider
Merge pull request #5 from forki/patch-1

Replace old stuff from the XRM provider