Add S3 upload configs and code updates