Add changes for windows