DataSources: Implemented new design; Suggest method is now in IDataSource