Added s3 repo and updated the mail class name