Add option for saving