Add S3 Support, changing the API a bit.

Space inside square brackets detected.