Adding support to Windows env