Initial work for Windows version