Improve save behavior