Changed all uploaders to use S3 storage