Added persistence for entered variables