Working on Windows support