Update for introducing Windows compatibility