Added support for S3 scheme