Updated Windows support