Added support for amazon