Add support for windows save/restore