Another step onto windows support