Added support for SimpleSave