Add better support for windows systems