Will add this. Should this be added in the Amazon S3 implementation, too?