Added functions for IDataService