Initial work for generic data sources.