Merged stuff into DataSourceFactory.