Added support for Amazon AMI