Better support for windows