Added persistence for windows