Improve s3-client