added EC2 support