Improve and simplify the save workflow