Make upload optional