Enhanced: save as draft