Adding support for windows