Removed DataProviderFactory hack