mover data source stuff to DataSourceManager