Working on windows support