Add option to disable save