Add S3 Storage management