Update :upload-location to be optional