Add S3 storage for static and default