First version of DataSources factory