Even more changes to DataSaver.php