Added support for multi-save