More EC2 Support appended.