Move provider specific code