Add support for partial saving