Added support for new windows triples