adding s3 support