Restructured Amazon S3 Connector