Save mechanism refactor for auto-drafts support