Improving support for windows