Adding Windows support