Adding support for Amazon.

This adds needed support for Amazon.