Update and support new Provider interface.