Removed data sources concept, moved into data format