Add code for windows support