Adding support for s3 urls containing buckets.