Improved save semantics