Update S3 support