Improving windows support