Removed data_sources