Add better windows support