Added s3 schema