Moved the IDatasource to data collector