Small changes to Database and DataSaver