Added Support for S3

Fixed Potential AWS Access Key ID charecter leak