Updated for AWS EC2 Instance types on 08-18