[EC2] Adding more flavors of windows