Add upload_label and save_label options