Add support for using S3 as the object store