Update to DataProviderFactory API