Updated S3 deployment support