Revised DataSources interface.