Added fields for s3 support.