Imported from Crosspop code base
Add S3Store