Adding S3 storage support