Feature/s3 service