updated SimpleDataSet for new database structure