Move to making a seprate resource/provider